diff options
| author | DRC <dcommander@users.sourceforge.net> | 2011-03-22 03:19:11 +0000 |
|---|---|---|
| committer | DRC <dcommander@users.sourceforge.net> | 2011-03-22 03:19:11 +0000 |
| commit | e6f597f28faa5c6c9fe578920d43a048a6375c07 (patch) | |
| tree | dc310cb878c7d04534547808cd1f1969b1de395c /release | |
| parent | bfa34cf143e75e3611ff6651d5ab7b90fe458db7 (diff) | |
| download | libjpeg-turbo-e6f597f28faa5c6c9fe578920d43a048a6375c07.tar.gz | |
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
Diffstat (limited to 'release')
| -rw-r--r-- | release/makesunpkg.in | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/release/makesunpkg.in b/release/makesunpkg.in index 64f70821..7580a864 100644 --- a/release/makesunpkg.in +++ b/release/makesunpkg.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 |