From 04523f7703a1db96426c6c9847f1f0f10aac2a65 Mon Sep 17 00:00:00 2001 From: teastep Date: Sun, 3 Sep 2006 17:05:13 +0000 Subject: [PATCH] Allow 'makeshorewall' to still work for version 3.2 git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4503 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- tools/build/makeshorewall | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/build/makeshorewall b/tools/build/makeshorewall index c96870ff6..fadcdabaa 100755 --- a/tools/build/makeshorewall +++ b/tools/build/makeshorewall @@ -299,7 +299,12 @@ if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then if [ -n "$HASLITE" ]; then progress_message "Exporting $LITESVNBRANCH from SVN..." do_or_die "svn export --non-interactive --force https://svn.sourceforge.net/svnroot/shorewall/$LITESVNBRANCH $SHOREWALLLITEDIR >> $LOGFILE 2>&1" - do_or_die "cp $SHOREWALLDIR/lib.base $SHOREWALLDIR/modules $SHOREWALLDIR/xmodules $SHOREWALLLITEDIR >> $LOGFILE 2>&1" + do_or_die "cp $SHOREWALLDIR/modules $SHOREWALLDIR/xmodules $SHOREWALLLITEDIR >> $LOGFILE 2>&1" + if [ -f $SHOREWALLDIR/lib.base ]; then + do_or_die "cp $SHOREWALLDIR/lib.base $SHOREWALLLITEDIR >> $LOGFILE 2>&1" + else + do_or_die "cp $SHOREWALLDIR/functions $SHOREWALLLITEDIR >> $LOGFILE 2>&1" + fi fi fgrep VERSION=$VERSION $SHOREWALLDIR/install.sh > /dev/null 2>&1 || fatal_error "install.sh has wrong version"