From 10eb721b51d4bea8f7c92f14bc88a672ae053544 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sat, 7 Apr 2007 17:20:09 +0000
Subject: [PATCH] Fix order of export vs cp

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5842 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 tools/build/buildshorewall | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/build/buildshorewall b/tools/build/buildshorewall
index 75e66ccab..11b24f58c 100755
--- a/tools/build/buildshorewall
+++ b/tools/build/buildshorewall
@@ -319,11 +319,16 @@ if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then
 
     rm -rf $SHOREWALLDIR
     rm -rf $SHOREWALLLITEDIR
+    rm -rf $PERLDIR
 
     do_or_die "svn export --non-interactive --force ${SVN}/$SVNBRANCH  $SHOREWALLDIR >> $LOGFILE 2>&1"
  
     progress_message "Exporting $LITESVNBRANCH from SVN..."
     do_or_die "svn export --non-interactive --force ${SVN}/$LITESVNBRANCH  $SHOREWALLLITEDIR >> $LOGFILE 2>&1"
+    	
+    progress_message "Exporting $PERLBRANCH from SVN..."
+    do_or_die "svn export --non-interactive --force ${SVN}/$PERLBRANCH  $PERLDIR >> $LOGFILE 2>&1"
+
     do_or_die "cp $SHOREWALLDIR/modules $SHOREWALLLITEDIR >> $LOGFILE 2>&1"
     if [ -f $SHOREWALLDIR/lib.base ]; then
 	do_or_die "cp $SHOREWALLDIR/lib.base $SHOREWALLLITEDIR >> $LOGFILE 2>&1"
@@ -386,11 +391,6 @@ if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then
 
     do_or_die "rm -rf $SHOREWALLDIR/debian"
 
-    rm -rf $PERLDIR
-    	
-    progress_message "Exporting $PERLBRANCH from SVN..."
-    do_or_die "svn export --non-interactive --force ${SVN}/$PERLBRANCH  $PERLDIR >> $LOGFILE 2>&1"
-    
     if [ -n "$BUILDTARBALL" ]; then
 	
 	progress_message "Creating $DIR/$TARBALL..."