Create sym links so that headers and static libs can always be found in the same...

git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@193 632fc199-4ca6-4c93-a231-07263d6284db

diff --git a/ChangeLog.txt b/ChangeLog.txt
index b4fac2600f90f813aa5e6cad1475b4fba2e4f9e0..ab03e61627fac07f96e61b0922832abd5cff37ca 100644 (file)
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -4,6 +4,11 @@ Significant changes since 0.0.93
 [1] Further FreeBSD build tweaks (no longer necessary to specify --host
 when configuring on a 64-bit system)
 
+[2] Created sym. links in the Unix/Linux packages so that the TurboJPEG
+include file can always be found in /opt/libjpeg-turbo/include, the 32-bit
+static libraries can always be found in /opt/libjpeg-turbo/lib32, and the
+64-bit static libraries can always be found in /opt/libjpeg-turbo/lib64.
+
 
 Significant changes since 0.0.91
 ================================

diff --git a/release/libjpeg-turbo.spec b/release/libjpeg-turbo.spec
index fe60d898f74df8f4faee13b99acc296d9cf88cbf..150da5a5649aafca4fef9819ee87330e5e62269a 100644 (file)
--- a/release/libjpeg-turbo.spec
+++ b/release/libjpeg-turbo.spec
@@ -53,6 +53,12 @@ mv $RPM_BUILD_ROOT/opt/%{name}/%{__lib}/libturbojpeg.* $RPM_BUILD_ROOT/usr/%{__l
 /sbin/ldconfig -n $RPM_BUILD_ROOT/usr/%{__lib}
 mkdir -p $RPM_BUILD_ROOT/usr/include
 mv $RPM_BUILD_ROOT/opt/%{name}/include/turbojpeg.h $RPM_BUILD_ROOT/usr/include
+ln -fs /usr/include/turbojpeg.h $RPM_BUILD_ROOT/opt/%{name}/include/
+ln -fs /usr/%{__lib}/libjpegturbo.a $RPM_BUILD_ROOT/opt/%{name}/%{__lib}/
+%ifarch x86_64
+%else
+ln -fs %{__lib} $RPM_BUILD_ROOT/opt/%{name}/lib32
+%endif
 
 %post -p /sbin/ldconfig
 
@@ -66,10 +72,15 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_srcdir}/README-turbo.txt %{_srcdir}/README %{_srcdir}/libjpeg.doc %{_srcdir}/LICENSE.txt %{_srcdir}/LGPL.txt
 %dir /opt/%{name}
 %dir /opt/%{name}/%{__lib}
+%ifarch x86_64
+%else
+/opt/%{name}/lib32
+%endif
 /opt/%{name}/%{__lib}/libjpeg.so.62.0.0
 /opt/%{name}/%{__lib}/libjpeg.so.62
 /opt/%{name}/%{__lib}/libjpeg.so
 /opt/%{name}/%{__lib}/libjpeg.a
+/opt/%{name}/%{__lib}/libjpegturbo.a
 /usr/%{__lib}/libturbojpeg.so
 /usr/%{__lib}/libturbojpeg.a
 /usr/include/turbojpeg.h
@@ -78,5 +89,6 @@ rm -rf $RPM_BUILD_ROOT
 /opt/%{name}/include/jerror.h
 /opt/%{name}/include/jmorecfg.h
 /opt/%{name}/include/jpeglib.h
+/opt/%{name}/include/turbojpeg.h
 
 %changelog

diff --git a/release/makedpkg b/release/makedpkg
index 34da6f7e63b40f3a702e61c52627b6ad28a41087..33a77450534fb41d9fff3ae1cbf7115b42773806 100644 (file)
--- a/release/makedpkg
+++ b/release/makedpkg
@@ -45,10 +45,16 @@ make install prefix=$TMPDIR/opt/$PACKAGE_NAME libdir=$TMPDIR/opt/$PACKAGE_NAME/$
 rm -f $TMPDIR/opt/$PACKAGE_NAME/$__LIB/*.la
 mkdir -p $TMPDIR/usr/$__LIB
 mv $TMPDIR/opt/$PACKAGE_NAME/$__LIB/libturbojpeg.* $TMPDIR/usr/$__LIB
+ln -fs /usr/$__LIB/libturbojpeg.a $TMPDIR/opt/$PACKAGE_NAME/$__LIB/
 /sbin/ldconfig -n $TMPDIR/opt/$PACKAGE_NAME/$__LIB
 /sbin/ldconfig -n $TMPDIR/usr/$__LIB
+if [ "$DEBARCH" = "amd64" ]; then
+       ln -fs $__LIB $TMPDIR/opt/$PACKAGE_NAME/lib64
+fi
+
 mkdir -p $TMPDIR/usr/include
 mv $TMPDIR/opt/$PACKAGE_NAME/include/turbojpeg.h $TMPDIR/usr/include
+ln -fs /usr/include/turbojpeg.h $TMPDIR/opt/$PACKAGE_NAME/include/
 mkdir -p $TMPDIR/usr/share/doc/$PACKAGE_NAME-$VERSION
 install -m 644 $SRCDIR/LICENSE.txt $TMPDIR/usr/share/doc/$PACKAGE_NAME-$VERSION
 install -m 644 $SRCDIR/LGPL.txt $TMPDIR/usr/share/doc/$PACKAGE_NAME-$VERSION

diff --git a/release/makemacpkg b/release/makemacpkg
index 5c44d291f9b3657cfeda3306a6d97a4a9b900e10..00343f83bcdb39e84ea1e3704f0ead905cef33a1 100644 (file)
--- a/release/makemacpkg
+++ b/release/makemacpkg
@@ -86,6 +86,11 @@ fi
 install_name_tool -id /opt/$PACKAGE_NAME/lib/libjpeg.62.dylib $PKGROOT/opt/$PACKAGE_NAME/lib/libjpeg.62.dylib
 install_name_tool -id libturbojpeg.dylib $PKGROOT/usr/lib/libturbojpeg.dylib
 
+ln -fs /usr/include/turbojpeg.h $PKGROOT/opt/$PACKAGE_NAME/include/
+ln -fs /usr/lib/libturbojpeg.a $PKGROOT/opt/$PACKAGE_NAME/lib/
+ln -fs lib $PKGROOT/opt/$PACKAGE_NAME/lib32
+ln -fs lib $PKGROOT/opt/$PACKAGE_NAME/lib64
+
 mkdir -p $PKGROOT/Library/Documentation/$PACKAGE_NAME
 chmod 1775 $PKGROOT/Library
 chmod 775 $PKGROOT/Library/Documentation 

diff --git a/release/makesunpkg b/release/makesunpkg
index 6261688c3ed6b188681b15b4447ff518097da4c5..b056e0ca1d818b284baa2df8eb6e9522b9f8b6b0 100644 (file)
--- a/release/makesunpkg
+++ b/release/makesunpkg
@@ -88,6 +88,7 @@ EOF
 fi
 if [ "${__LIB}" != "lib" ]; then
 echo d none libjpeg-turbo/${__LIB} 0755 root bin >>$TMPDIR/proto
+echo s none libjpeg-turbo/lib64=${__LIB} >>$TMPDIR/proto
 fi
 cat >>$TMPDIR/proto <<EOF
 f none libjpeg-turbo/${__LIB}/libjpeg.so.62.0.0 0755 root bin
@@ -96,6 +97,7 @@ s none libjpeg-turbo/${__LIB}/libjpeg.so=libjpeg.so.62.0.0
 f none libjpeg-turbo/${__LIB}/libjpeg.a 0644 root bin
 f none libjpeg-turbo/${__LIB}/libturbojpeg.so 0755 root bin
 f none libjpeg-turbo/${__LIB}/libturbojpeg.a 0644 root bin
+s none libjpeg-turbo/lib32=lib
 d none libjpeg-turbo/include 0755 root bin
 f none libjpeg-turbo/include/jconfig.h 0644 root bin
 f none libjpeg-turbo/include/jerror.h 0644 root bin

diff --git a/release/uninstall.sh.tmpl b/release/uninstall.sh.tmpl
index 1cc53b70d7c8b8683d79f055ef14948a9512bd3b..650fe8b5cc8926d7e58ad109b3ba7e9604719c73 100644 (file)
--- a/release/uninstall.sh.tmpl
+++ b/release/uninstall.sh.tmpl
@@ -52,6 +52,8 @@ fi
 if [ -d /opt/$PKGNAME/include ]; then
        rmdir /opt/$PKGNAME/include 2>&1 || RETCODE=-1
 fi
+rm /opt/$PKGNAME/lib32 2>&1 || RETCODE=-1
+rm /opt/$PKGNAME/lib64 2>&1 || RETCODE=-1
 rmdir /opt/$PKGNAME 2>&1 || RETCODE=-1
 rmdir /Library/Documentation/$PKGNAME 2>&1 || RETCODE=-1