From bb53ebadf500be4b79559dbfa4c916f11649bdd8 Mon Sep 17 00:00:00 2001 From: rtoy <rtoy> Date: Fri, 9 Jan 2009 18:27:26 +0000 Subject: [PATCH] make-dist.sh: o /bin/sh doesn't like ${MANDIR:+ -M ${MANDIR}} when calling make-main-dist.sh. So just set MANDIR with the right value. make-main-dist.sh: o Don't call tar with the individual directories. Just tar up everything in the current directory. --- tools/make-dist.sh | 3 ++- tools/make-main-dist.sh | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/make-dist.sh b/tools/make-dist.sh index 5f42912d5..11b5fe5a3 100755 --- a/tools/make-dist.sh +++ b/tools/make-dist.sh @@ -123,9 +123,10 @@ if [ -z "$ENABLE_GZIP" -a -z "$ENABLE_BZIP" ]; then fi OPTIONS="${GROUP:+ -G ${GROUP}} ${OWNER:+ -O ${OWNER}} ${INSTALL_DIR:+ -I ${INSTALL_DIR}} $ENABLE_GZIP $ENABLE_BZIP" +MANDIR="${MANDIR:+ -M ${MANDIR}}" echo Creating distribution for $ARCH $OS -$ROOT/make-main-dist.sh $OPTIONS ${MANDIR:+ -M ${MANDIR}} $TARGET $VERSION $ARCH $OS || exit 1 +$ROOT/make-main-dist.sh $OPTIONS ${MANDIR} $TARGET $VERSION $ARCH $OS || exit 1 $ROOT/make-extra-dist.sh $OPTIONS $TARGET $VERSION $ARCH $OS || exit 2 if [ X"$MAKE_SRC_DIST" = "Xyes" ]; then diff --git a/tools/make-main-dist.sh b/tools/make-main-dist.sh index 01ba2be2d..f25c723b3 100755 --- a/tools/make-main-dist.sh +++ b/tools/make-main-dist.sh @@ -138,12 +138,12 @@ if [ -z "$INSTALL_DIR" ]; then echo Tarring main components if [ -n "$ENABLE_GZIP" ]; then echo " Compressing with gzip" - ( cd $DESTDIR >/dev/null ; tar cf - bin doc lib `dirname $MANDIR` ) | \ + ( cd $DESTDIR >/dev/null ; tar cf - . ) | \ gzip -c > cmucl-$VERSION-$ARCH-$OS.tar.gz fi if [ -n "$ENABLE_BZIP" ]; then echo " Compressing with bzip" - ( cd $DESTDIR >/dev/null ; tar cf - bin doc lib `dirname $MANDIR` ) | \ + ( cd $DESTDIR >/dev/null ; tar cvvvf - . ) | \ bzip2 > cmucl-$VERSION-$ARCH-$OS.tar.bz2 fi -- GitLab