diff --git a/zlib.changes b/zlib.changes index ac102d0..37fb486 100644 --- a/zlib.changes +++ b/zlib.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Dec 22 14:31:42 CET 2011 - meissner@suse.de + +- use configure options for library paths. Also fixes + the pkg-config file to not have /usr/local bnc#738169 + ------------------------------------------------------------------- Wed Dec 7 15:29:27 UTC 2011 - coolo@suse.com diff --git a/zlib.spec b/zlib.spec index cf970be..1a8d9d7 100644 --- a/zlib.spec +++ b/zlib.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: zlib Provides: libz Obsoletes: libz @@ -89,14 +90,14 @@ export LDFLAGS="-Wl,-z,relro,-z,now" %if %{do_profiling} profiledir=$(mktemp -d) trap "rm -rf $profiledir" EXIT -CC="%__cc" ./configure --shared +CC="%__cc" ./configure --shared --prefix=%_prefix --libdir=/%_lib %{__make} CFLAGS="$RPM_OPT_FLAGS %{cflags_profile_generate}=$profiledir" %{?_smp_mflags} time make check make clean %{__make} CFLAGS="$RPM_OPT_FLAGS %{cflags_profile_feedback}=$profiledir" %{?_smp_mflags} %else export CFLAGS="%optflags" -CC="%__cc" ./configure --shared +CC="%__cc" ./configure --shared --prefix=%_prefix --libdir=/%_lib %{__make} %{?_smp_mflags} %endif @@ -104,12 +105,9 @@ CC="%__cc" ./configure --shared time make check %install -mkdir -p %{buildroot}{/%{_lib},%{_libdir}} -mkdir -p %{buildroot}%{_mandir}/man3 -mkdir -p %{buildroot}%{_includedir} -make install \ - prefix=%{buildroot}%{_prefix} \ - libdir=%{buildroot}/%{_lib} +#mkdir -p %{buildroot}%{_mandir}/man3 +mkdir -p %{buildroot}%{_libdir} +make install DESTDIR=%{buildroot} %{__ln_s} -v /%{_lib}/$(readlink %{buildroot}/%{_lib}/libz.so) %{buildroot}%{_libdir}/libz.so %{__rm} -v %{buildroot}/%{_lib}/libz.so # static lib