Don't use architecture extension in package name, since we're building a combined package
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.1.x@531 632fc199-4ca6-4c93-a231-07263d6284db
This commit is contained in:
@@ -38,20 +38,17 @@ fi
|
||||
|
||||
umask 022
|
||||
TMPDIR=`mktemp -d /tmp/$PACKAGE_NAME-build.XXXXXX`
|
||||
rm -f $PACKAGE_NAME.pkg.bz2
|
||||
cp $SRCDIR/release/copyright $TMPDIR
|
||||
touch $TMPDIR/depend
|
||||
cp pkgscripts/pkginfo $TMPDIR/pkginfo
|
||||
|
||||
if [ "$PKGARCH" = "i386" ]; then
|
||||
__LIB=lib
|
||||
PKGEXT=-x86;
|
||||
elif [ "$PKGARCH" = "amd64" ]; then
|
||||
else
|
||||
__LIB=lib/$PKGARCH
|
||||
PKGEXT=-x64;
|
||||
fi
|
||||
|
||||
rm -f $PACKAGE_NAME-$VERSION$PKGEXT.pkg.bz2
|
||||
|
||||
if [ $COMBINED = 1 ]; then
|
||||
if [ ! -d $BUILDDIR32 ]; then
|
||||
echo ERROR: 32-bit build directory $BUILDDIR32 does not exist
|
||||
@@ -133,8 +130,8 @@ f none $PACKAGE_NAME/doc/usage.txt 0644 root bin
|
||||
EOF
|
||||
|
||||
pkgmk -o -r $TMPDIR/opt -d $TMPDIR -a i386 -f $TMPDIR/proto
|
||||
pkgtrans -s $TMPDIR $TMPDIR/$PACKAGE_NAME-$VERSION$PKGEXT.pkg $PACKAGE_NAME
|
||||
bzip2 $TMPDIR/$PACKAGE_NAME-$VERSION$PKGEXT.pkg
|
||||
cp $TMPDIR/$PACKAGE_NAME-$VERSION$PKGEXT.pkg.bz2 .
|
||||
pkgtrans -s $TMPDIR $TMPDIR/$PACKAGE_NAME-$VERSION$.pkg $PACKAGE_NAME
|
||||
bzip2 $TMPDIR/$PACKAGE_NAME-$VERSION$.pkg
|
||||
cp $TMPDIR/$PACKAGE_NAME-$VERSION$.pkg.bz2 .
|
||||
|
||||
exit
|
||||
|
||||
Reference in New Issue
Block a user