aboutsummaryrefslogtreecommitdiff
path: root/release/makesunpkg.in
diff options
context:
space:
mode:
Diffstat (limited to 'release/makesunpkg.in')
-rw-r--r--release/makesunpkg.in13
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