]> granicus.if.org Git - libjpeg-turbo/commitdiff
For some unknown reason, the sym link and the actual file get flipped around whenever...
authorDRC <dcommander@users.sourceforge.net>
Tue, 23 Feb 2010 10:22:33 +0000 (10:22 +0000)
committerDRC <dcommander@users.sourceforge.net>
Tue, 23 Feb 2010 10:22:33 +0000 (10:22 +0000)
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@143 632fc199-4ca6-4c93-a231-07263d6284db

release/makemacpkg

index 8460b7ee81f13777b838cf9a5de8b8055f5512ab..567933af3fac6761b5c5aada5a1f1fa13abf535b 100644 (file)
@@ -61,9 +61,18 @@ if [ $UNIVERSAL = 1 ]; then
                LDFLAGS='-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -m32'
        make prefix=$TMPDIR/dist.x86 install
        popd
-       lipo -create -arch i386 $TMPDIR/dist.x86/lib/libjpeg.62.dylib -arch x86_64 \
-               $PKGROOT/opt/$PACKAGE_NAME/lib/libjpeg.62.dylib \
-               -output $PKGROOT/opt/$PACKAGE_NAME/lib/libjpeg.62.dylib
+       ls -l $TMPDIR/dist.x86/lib
+       if [ ! -h $TMPDIR/dist.x86/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 \
+                       -output $PKGROOT/opt/$PACKAGE_NAME/lib/libjpeg.62.dylib
+       elif [ ! -h $TMPDIR/dist.x86/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 \
+                       -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 \
                -output $PKGROOT/opt/$PACKAGE_NAME/lib/libjpeg.a