Ensure that libdir is set properly during build and install so that the run-time library bindings for the binary programs will be correct

git-svn-id: https://libjpeg-turbo.svn.sourceforge.net/svnroot/libjpeg-turbo@205 3789f03b-4d11-0410-bbf8-ca57d06f2519

3 files changed, 43 insertions, 35 deletions

diff --git a/trunk/release/libjpeg-turbo.spec b/trunk/release/libjpeg-turbo.spec
index 0d40280..b58ced0 100644
--- a/trunk/release/libjpeg-turbo.spec
+++ b/trunk/release/libjpeg-turbo.spec
@@ -39,13 +39,13 @@ TurboJPEG/IPP.  It is faster in some areas but slower in others.
 #-->%setup -q
 
 #-->%build
-#-->configure prefix=$RPM_BUILD_ROOT/opt/%{name} libdir=$RPM_BUILD_ROOT/opt/%{name}/%{__lib} mandir=$RPM_BUILD_ROOT/opt/%{name}/man --with-pic
-#-->make prefix=$RPM_BUILD_ROOT/opt/%{name} libdir=$RPM_BUILD_ROOT/opt/%{name}/%{__lib} mandir=$RPM_BUILD_ROOT/opt/%{name}/man
+#-->configure libdir=/opt/%{name}/%{__lib} mandir=/opt/%{name}/man --with-pic
+#-->make DESTDIR=$RPM_BUILD_ROOT libdir=/opt/%{name}/%{__lib} mandir=/opt/%{name}/man
 
 %install
 
 rm -rf $RPM_BUILD_ROOT
-make install prefix=$RPM_BUILD_ROOT/opt/%{name} libdir=$RPM_BUILD_ROOT/opt/%{name}/%{__lib} mandir=$RPM_BUILD_ROOT/opt/%{name}/man
+make install DESTDIR=$RPM_BUILD_ROOT libdir=/opt/%{name}/%{__lib} mandir=/opt/%{name}/man
 rm -f $RPM_BUILD_ROOT/opt/%{name}/%{__lib}/*.la
 mkdir -p $RPM_BUILD_ROOT/usr/%{__lib}
 mv $RPM_BUILD_ROOT/opt/%{name}/%{__lib}/libturbojpeg.* $RPM_BUILD_ROOT/usr/%{__lib}
diff --git a/trunk/release/makemacpkg b/trunk/release/makemacpkg
index 35c31f6..5386f68 100644
--- a/trunk/release/makemacpkg
+++ b/trunk/release/makemacpkg
@@ -42,7 +42,7 @@ TMPDIR=`mktemp -d /tmp/$PACKAGE_NAME-build.XXXXXX`
 PKGROOT=$TMPDIR/pkg/Package_Root
 mkdir -p $PKGROOT
 mkdir -p $PKGROOT/opt/$PACKAGE_NAME/bin
-make install prefix=$PKGROOT/opt/$PACKAGE_NAME mandir=$PKGROOT/opt/$PACKAGE_NAME/man
+make install DESTDIR=$PKGROOT mandir=/opt/$PACKAGE_NAME/man
 rm -f $PKGROOT/opt/$PACKAGE_NAME/lib/*.la
 mkdir -p $PKGROOT/usr/lib
 mv $PKGROOT/opt/$PACKAGE_NAME/lib/libturbojpeg.* $PKGROOT/usr/lib
@@ -59,42 +59,52 @@ if [ $UNIVERSAL = 1 ]; then
 		CFLAGS='-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -O3 -m32' \
 		CXXFLAGS='-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -O3 -m32' \
 		LDFLAGS='-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -m32'
-	make prefix=$TMPDIR/dist.x86 install
+	make install DESTDIR=$TMPDIR/dist.x86
 	popd
-	if [ ! -h $TMPDIR/dist.x86/lib/libjpeg.62.dylib -a \
+	if [ ! -h $TMPDIR/dist.x86/opt/$PACKAGE_NAME/lib/libjpeg.62.dylib -a \
 		! -h $PKGROOT/opt/$PACKAGE_NAME/lib/libjpeg.62.dylib ]; then
-		lipo -create -arch i386 $TMPDIR/dist.x86/lib/libjpeg.62.dylib -arch x86_64 \
-			$PKGROOT/opt/$PACKAGE_NAME/lib/libjpeg.62.dylib \
+		lipo -create \
+			-arch i386 $TMPDIR/dist.x86/opt/$PACKAGE_NAME/lib/libjpeg.62.dylib \
+			-arch x86_64 $PKGROOT/opt/$PACKAGE_NAME/lib/libjpeg.62.dylib \
 			-output $PKGROOT/opt/$PACKAGE_NAME/lib/libjpeg.62.dylib
-	elif [ ! -h $TMPDIR/dist.x86/lib/libjpeg.62.0.0.dylib -a \
+	elif [ ! -h $TMPDIR/dist.x86/opt/$PACKAGE_NAME/lib/libjpeg.62.0.0.dylib -a \
 		! -h $PKGROOT/opt/$PACKAGE_NAME/lib/libjpeg.62.0.0.dylib ]; then
-		lipo -create -arch i386 $TMPDIR/dist.x86/lib/libjpeg.62.0.0.dylib \
+		lipo -create \
+			-arch i386 $TMPDIR/dist.x86/opt/$PACKAGE_NAME/lib/libjpeg.62.0.0.dylib \
 			-arch x86_64 $PKGROOT/opt/$PACKAGE_NAME/lib/libjpeg.62.0.0.dylib \
 			-output $PKGROOT/opt/$PACKAGE_NAME/lib/libjpeg.62.0.0.dylib
 	fi
-	lipo -create -arch i386 $TMPDIR/dist.x86/lib/libjpeg.a -arch x86_64 \
-		$PKGROOT/opt/$PACKAGE_NAME/lib/libjpeg.a \
+	lipo -create \
+		-arch i386 $TMPDIR/dist.x86/opt/$PACKAGE_NAME/lib/libjpeg.a \
+		-arch x86_64 $PKGROOT/opt/$PACKAGE_NAME/lib/libjpeg.a \
 		-output $PKGROOT/opt/$PACKAGE_NAME/lib/libjpeg.a
-	lipo -create -arch i386 $TMPDIR/dist.x86/lib/libturbojpeg.dylib -arch x86_64 \
-		$PKGROOT/usr/lib/libturbojpeg.dylib \
+	lipo -create \
+		-arch i386 $TMPDIR/dist.x86/usr/lib/libturbojpeg.dylib \
+		-arch x86_64 $PKGROOT/usr/lib/libturbojpeg.dylib \
 		-output $PKGROOT/usr/lib/libturbojpeg.dylib
-	lipo -create -arch i386 $TMPDIR/dist.x86/lib/libturbojpeg.a -arch x86_64 \
-		$PKGROOT/usr/lib/libturbojpeg.a \
+	lipo -create \
+		-arch i386 $TMPDIR/dist.x86/usr/lib/libturbojpeg.a \
+		-arch x86_64 $PKGROOT/usr/lib/libturbojpeg.a \
 		-output $PKGROOT/usr/lib/libturbojpeg.a
-	lipo -create -arch i386 $TMPDIR/dist.x86/bin/cjpeg -arch x86_64 \
-		$PKGROOT/opt/$PACKAGE_NAME/bin/cjpeg \
+	lipo -create \
+		-arch i386 $TMPDIR/dist.x86/opt/$PACKAGE_NAME/bin/cjpeg \
+		-arch x86_64 $PKGROOT/opt/$PACKAGE_NAME/bin/cjpeg \
 		-output $PKGROOT/opt/$PACKAGE_NAME/bin/cjpeg
-	lipo -create -arch i386 $TMPDIR/dist.x86/bin/djpeg -arch x86_64 \
-		$PKGROOT/opt/$PACKAGE_NAME/bin/djpeg \
+	lipo -create \
+		-arch i386 $TMPDIR/dist.x86/opt/$PACKAGE_NAME/bin/djpeg \
+		-arch x86_64 $PKGROOT/opt/$PACKAGE_NAME/bin/djpeg \
 		-output $PKGROOT/opt/$PACKAGE_NAME/bin/djpeg
-	lipo -create -arch i386 $TMPDIR/dist.x86/bin/jpegtran -arch x86_64 \
-		$PKGROOT/opt/$PACKAGE_NAME/bin/jpegtran \
+	lipo -create \
+		-arch i386 $TMPDIR/dist.x86/opt/$PACKAGE_NAME/bin/jpegtran \
+		-arch x86_64 $PKGROOT/opt/$PACKAGE_NAME/bin/jpegtran \
 		-output $PKGROOT/opt/$PACKAGE_NAME/bin/jpegtran
-	lipo -create -arch i386 $TMPDIR/dist.x86/bin/rdjpgcom -arch x86_64 \
-		$PKGROOT/opt/$PACKAGE_NAME/bin/rdjpgcom \
+	lipo -create \
+		-arch i386 $TMPDIR/dist.x86/opt/$PACKAGE_NAME/bin/rdjpgcom \
+		-arch x86_64 $PKGROOT/opt/$PACKAGE_NAME/bin/rdjpgcom \
 		-output $PKGROOT/opt/$PACKAGE_NAME/bin/rdjpgcom
-	lipo -create -arch i386 $TMPDIR/dist.x86/bin/wrjpgcom -arch x86_64 \
-		$PKGROOT/opt/$PACKAGE_NAME/bin/wrjpgcom \
+	lipo -create \
+		-arch i386 $TMPDIR/dist.x86/opt/$PACKAGE_NAME/bin/wrjpgcom \
+		-arch x86_64 $PKGROOT/opt/$PACKAGE_NAME/bin/wrjpgcom \
 		-output $PKGROOT/opt/$PACKAGE_NAME/bin/wrjpgcom
 
 fi
diff --git a/trunk/release/makesunpkg b/trunk/release/makesunpkg
index d42a731..2bc40d4 100644
--- a/trunk/release/makesunpkg
+++ b/trunk/release/makesunpkg
@@ -38,8 +38,6 @@ fi
 umask 022
 TMPDIR=`mktemp -d /tmp/$PACKAGE_NAME-build.XXXXXX`
 rm -f $PACKAGE_NAME.pkg.bz2
-PKGROOT=$TMPDIR/pkgbuild/$PACKAGE_NAME
-mkdir -p $PKGROOT
 cp $SRCDIR/release/copyright $TMPDIR
 touch $TMPDIR/depend
 cat $SRCDIR/release/pkginfo.tmpl | sed s/{__VERSION}/$VERSION/g \
@@ -60,14 +58,14 @@ if [ $COMBINED = 1 ]; then
 	PWD=`pwd`
 	cd $SRCDIR/solx86
 	sh $SRCDIR/configure --with-pic CC=$CC CXX=$CXX CFLAGS= CXXFLAGS= LDFLAGS= host_alias=
-	make install prefix=$PKGROOT AM_MAKEFLAGS="prefix=$PKGROOT mandir=$PKGROOT/man"
+	make install DESTDIR=$TMPDIR mandir=/opt/$PACKAGE_NAME/man AM_MAKEFLAGS="mandir=/opt/$PACKAGE_NAME/man"
 	cd $PWD
 fi
-make install prefix=$PKGROOT libdir=$PKGROOT/$__LIB mandir=$PKGROOT/man AM_MAKEFLAGS="prefix=$PKGROOT libdir=$PKGROOT/$__LIB mandir=$PKGROOT/man"
-rm -f $PKGROOT/$__LIB/*.la
-mkdir -p $PKGROOT/doc
-cp $SRCDIR/LICENSE.txt $SRCDIR/LGPL.txt $SRCDIR/README-turbo.txt $SRCDIR/README $SRCDIR/libjpeg.doc $SRCDIR/usage.doc $PKGROOT/doc
-chmod 644 $PKGROOT/doc/*
+make install DESTDIR=$TMPDIR libdir=/opt/$PACKAGE_NAME/$__LIB mandir=/opt/$PACKAGE_NAME/man AM_MAKEFLAGS="libdir=/opt/$PACKAGE_NAME/$__LIB mandir=/opt/$PACKAGE_NAME/man"
+rm -f $TMPDIR/opt/$PACKAGE_NAME/$__LIB/*.la
+mkdir -p $TMPDIR/opt/$PACKAGE_NAME/doc
+cp $SRCDIR/LICENSE.txt $SRCDIR/LGPL.txt $SRCDIR/README-turbo.txt $SRCDIR/README $SRCDIR/libjpeg.doc $SRCDIR/usage.doc $TMPDIR/opt/$PACKAGE_NAME/doc
+chmod 644 $TMPDIR/opt/$PACKAGE_NAME/doc/*
 
 cat >$TMPDIR/proto <<EOF
 i copyright
@@ -127,7 +125,7 @@ f none $PACKAGE_NAME/doc/README-turbo.txt 0644 root bin
 f none $PACKAGE_NAME/doc/usage.doc 0644 root bin
 EOF
 
-pkgmk -o -r $TMPDIR/pkgbuild -d $TMPDIR -a i386 -f $TMPDIR/proto
+pkgmk -o -r $TMPDIR/opt -d $TMPDIR -a i386 -f $TMPDIR/proto
 pkgtrans -s $TMPDIR $TMPDIR/$PACKAGE_NAME.pkg $PACKAGE_NAME
 bzip2 $TMPDIR/$PACKAGE_NAME.pkg
 cp $TMPDIR/$PACKAGE_NAME.pkg.bz2 .