From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Mon, 14 Jan 2008 19:28:19 +0000 (+0000)
Subject: - force %{_lib}-independent libdir
X-Git-Tag: auto/th/crossmingw32-libjpeg-6b-6~3
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcrossmingw32-libjpeg.git;a=commitdiff_plain;h=045553921a372f52b0c62cb35dd3da0dcee80146;hp=763f7f07bf939bc35c382fe164268bbe1f406a72

- force %{_lib}-independent libdir

Changed files:
    crossmingw32-libjpeg.spec -> 1.14
---

diff --git a/crossmingw32-libjpeg.spec b/crossmingw32-libjpeg.spec
index 45dbbc7..55f32ca 100644
--- 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