Allow the libjpeg-turbo32 package to be used on MultiArch-compatible systems without...

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

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 4a592c09eb4bf5cf718191d68a0c681f3b77ba15..0cc61fde07f71d568216107b72f0ba99b6894d7d 100644 (file)
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -3,6 +3,11 @@
 
 [1] The tjDecompressToYUV() function now supports the TJFLAG_FASTDCT flag.
 
+[2] The 32-bit supplementary package for amd64 Debian systems now provides
+symlinks in /usr/lib/i386-linux-gnu for the TurboJPEG libraries in /usr/lib32.
+This allows those libraries to be used on MultiArch-compatible systems (such as
+Ubuntu 11 and later) without setting the linker path.
+
 
 1.2.1
 =====

diff --git a/release/makedpkg.in b/release/makedpkg.in
index 6d081bb61fc6a4d47716f98aa466bde4a6bd7be3..628e0a64f8a98fdc62fa622a2562389698575923 100644 (file)
--- a/release/makedpkg.in
+++ b/release/makedpkg.in
@@ -67,6 +67,10 @@ makedeb()
                mkdir -p $TMPDIR/usr/include
                mv $TMPDIR/opt/$DIRNAME/include/turbojpeg.h $TMPDIR/usr/include
                ln -fs /usr/include/turbojpeg.h $TMPDIR/opt/$DIRNAME/include/
+       else
+               mkdir -p $TMPDIR/usr/lib/i386-linux-gnu
+               ln -fs /usr/lib32/libturbojpeg.so $TMPDIR/usr/lib/i386-linux-gnu/libturbojpeg.so
+               ln -fs /usr/lib32/libturbojpeg.a $TMPDIR/usr/lib/i386-linux-gnu/libturbojpeg.a
        fi
 
        sudo chown -Rh root:root $TMPDIR/*