From 10430ad0520636ea2440f2e8704486e840b2daa2 Mon Sep 17 00:00:00 2001 From: teastep Date: Mon, 5 Jun 2006 21:10:32 +0000 Subject: [PATCH] Avoid duplicate files in Shorewall and Shorewall Lite git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3993 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- tools/build/makeshorewall | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/build/makeshorewall b/tools/build/makeshorewall index 98056a332..27b5a0b9c 100755 --- a/tools/build/makeshorewall +++ b/tools/build/makeshorewall @@ -42,7 +42,7 @@ # # XSL Stylesheet to use for XML->HTML conversion # -STYLESHEET=/usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl +STYLESHEET=/usr/share/xml/docbook/stylesheet/nwalsh/current/xhtml/docbook.xsl # # Directory where the build log will be placed. The log has the name # shorewall_build_.log @@ -202,7 +202,7 @@ esac VERSION=$1 LOGFILE=$LOGDIR/shorewall_build_${VERSION}.log # location and options for GnuPG -GPG="/usr/bin/gpg -ab --no-use-agent --comment 'To verify this, you can download our public key at https://lists.shorewall.net/shorewall.gpg.key'" +GPG="/usr/bin/gpg -ab --comment 'To verify this, you can download our public key at https://lists.shorewall.net/shorewall.gpg.key'" touch $LOGFILE progress_message "Build of Shorewall $VERSION on $(date)" @@ -294,6 +294,7 @@ 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/functions $SHOREWALLDIR/modules $SHOREWALLDIR/modules $SHOREWALLLITEDIR >> $LOGFILE 2>&1" fi fgrep VERSION=$VERSION $SHOREWALLDIR/install.sh > /dev/null 2>&1 || fatal_error "install.sh has wrong version"