- force %{_lib}-independent libdir

[packages/crossmingw32-libjpeg.git] / crossmingw32-libjpeg.spec

diff --git a/crossmingw32-libjpeg.spec b/crossmingw32-libjpeg.spec
index 9fe2b4d3f130f359611099953eb16d5fdc7114c1..55f32ca118ec73b41d761e08cc29d5b513f33c10 100644 (file)
--- a/crossmingw32-libjpeg.spec
+++ b/crossmingw32-libjpeg.spec
@@ -21,10 +21,10 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                target                  i386-mingw32
 %define                target_platform         i386-pc-mingw32
-%define                arch                    %{_prefix}/%{target}
 
 %define                _sysprefix              /usr
 %define                _prefix                 %{_sysprefix}/%{target}
+%define                _libdir                 %{_prefix}/lib
 %define                _dlldir                 /usr/share/wine/windows/system
 %define                __cc                    %{target}-gcc
 %define                __cxx                   %{target}-g++
@@ -82,7 +82,7 @@ LD=%{target}-ld ; export LD
 AR=%{target}-ar ; export AR
 AS=%{target}-as ; export AS
 CROSS_COMPILE=1 ; export CROSS_COMPILE
-CPPFLAGS="-I%{arch}/include" ; export CPPFLAGS
+CPPFLAGS="-I%{_includedir}" ; export CPPFLAGS
 RANLIB=%{target}-ranlib ; export RANLIB
 LDSHARED="%{target}-gcc -shared" ; export LDSHARED
 TARGET="%{target}" ; export TARGET
@@ -90,8 +90,7 @@ TARGET="%{target}" ; export TARGET
 %configure \
        --target=%{target} \
        --host=%{target} \
-       --build=i386-linux \
-       --prefix=%{arch}
+       --build=i386-linux
 
 %{__make}
 %{__make} jpeg.dll
@@ -114,7 +113,7 @@ old_library='libjpeg.a'
 # Libraries that this one depends upon.
 dependency_libs=''
 
-# Version information for libz.
+# Version information for libjpeg.
 current=0
 age=0
 revision=0
@@ -133,16 +132,18 @@ dlpreopen=''
 libdir='%{_libdir}'
 EOF
 
+%if 0%{!?debug:1}
 %{target}-strip jpeg.dll
 %{target}-strip -g -R.comment -R.note *.a
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_prefix}/{include,lib,bin}
+install -d $RPM_BUILD_ROOT{%{_includedir},%{_libdir},%{_dlldir}}
 
 install jconfig.h jerror.h jmorecfg.h jpeglib.h jversion.h $RPM_BUILD_ROOT%{_includedir}
 install *.a $RPM_BUILD_ROOT%{_libdir}
-install jpeg.dll $RPM_BUILD_ROOT%{_bindir}/libjpeg.dll
+install jpeg.dll $RPM_BUILD_ROOT%{_dlldir}/libjpeg.dll
 install libjpeg.la $RPM_BUILD_ROOT%{_libdir}
 
 %clean
@@ -160,4 +161,4 @@ rm -rf $RPM_BUILD_ROOT
 
 %files dll
 %defattr(644,root,root,755)
-%{_bindir}/libjpeg.dll
+%{_dlldir}/libjpeg.dll