X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=bootstrap;h=d62061725623f3fd2e6149aba42a3a7e2df7b289;hb=46f09016e8219719179da09ee499981911054b5a;hp=bd0939a16e79d458e4e2da52d0a014881201be46;hpb=67c7284d07f9b8de0c0d46c6e8134b856b5fe213;p=chaz%2Ftar

diff --git a/bootstrap b/bootstrap
index bd0939a..d620617 100755
--- a/bootstrap
+++ b/bootstrap
@@ -16,8 +16,8 @@
 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
 
 # Written by Paul Eggert and Sergey Poznyakoff.
 
@@ -162,12 +162,16 @@ checkout() {
   fi
 }
 
-# Prepare temporary module list
-cat /dev/null > modlist.tmp
-trap 'rm -f modlist.tmp' 0 1 2 13 15
+gnulib_modules=
+newline='
+'
 
 get_modules() {
-	sed '/^[ 	]*#/d;/^[ 	]*$/d' $* >> modlist.tmp
+  new_gnulib_modules=`sed '/^[	 ]*#/d; /^[	 ]*$/d' $*`
+  case $gnulib_modules,$new_gnulib_modules in
+  ?*,?*) new_gnulib_modules=$newline$new_gnulib_modules;;
+  esac
+  gnulib_modules=$gnulib_modules$new_gnulib_modules
 }
 
 # Get paxutils files
@@ -206,11 +210,10 @@ else
    mkdir rmt
 fi
 
-copy_files ${PAXUTILS_SRCDIR}/rmt rmt
-
-copy_files ${PAXUTILS_SRCDIR}/lib lib
-
-copy_files ${PAXUTILS_SRCDIR}/tests tests
+for dir in doc rmt lib tests
+do
+	copy_files ${PAXUTILS_SRCDIR}/$dir $dir
+done
 
 # Get gnulib files.
 
@@ -223,7 +226,7 @@ esac
 
 get_modules gnulib.modules
 
-gnulib_modules=`sort -u modlist.tmp`
+gnulib_modules=`echo "$gnulib_modules" | sort -u`
 previous_gnulib_modules=
 while [ "$gnulib_modules" != "$previous_gnulib_modules" ]; do
   previous_gnulib_modules=$gnulib_modules