diff --git a/libHX.changes b/libHX.changes index 1a904f3..733a5cb 100644 --- a/libHX.changes +++ b/libHX.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Dec 15 00:44:16 UTC 2014 - jengelh@inai.de + +- Switch to an out-of-tree build. Drop /pkg from include path. + ------------------------------------------------------------------- Mon Aug 25 15:20:02 UTC 2014 - jengelh@inai.de diff --git a/libHX.spec b/libHX.spec index 71742ae..b1060ff 100644 --- a/libHX.spec +++ b/libHX.spec @@ -77,19 +77,23 @@ tar -xf "%{S:0}" --use=xz; %endif %build -%configure --includedir="%_includedir/pkg/%name" --docdir="%_docdir/%name" +mkdir obj +pushd obj/ +%define _configure ../configure +%configure --includedir="%_includedir/%name" --docdir="%_docdir/%name" make %{?_smp_mflags} +popd %install b="%buildroot"; -make DESTDIR="$b" install +%make_install -C obj mkdir -p "$b/%_docdir/%name" install -pm0644 doc/* "$b/%_docdir/%name" rm -f "$b/%_docdir/%name"/Makefile* find "$b/%_libdir" -type f -name "*.la" -delete; %check -make check %{?_smp_mflags} +make -C obj check %{?_smp_mflags} %post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig @@ -101,7 +105,7 @@ make check %{?_smp_mflags} %files devel %defattr(-,root,root) %_docdir/%name/ -%_includedir/pkg/ +%_includedir/%name/ %_libdir/libHX*.so %_libdir/pkgconfig/libHX.pc