X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=bootstrap;h=32f4d07b44ac52e3d06aeb332f9a9f1ea0a9fb71;hb=8c528937a93b428910f062bcf984c28922f0cde7;hp=6d9ac6728374051a43874b33c5b71b9087cd8270;hpb=625c45d304761186d81065ff9773895230d13437;p=chaz%2Ftar

diff --git a/bootstrap b/bootstrap
index 6d9ac67..32f4d07 100755
--- a/bootstrap
+++ b/bootstrap
@@ -339,28 +339,6 @@ copy_files() {
   done
 }
 
-copy_files ${PAXUTILS_SRCDIR}/m4 m4
-echo "$0: Creating m4/paxutils.m4"
-(echo "# This file is generated automatically. Please, do not edit."
- echo "#"
- echo "AC_DEFUN([${package}_PAXUTILS],["
- cat ${PAXUTILS_SRCDIR}/m4/DISTFILES | sed '/^#/d;s/\(.*\)\.m4/pu_\1/' | tr a-z A-Z
- echo "])") > ./m4/paxutils.m4
-ignorefile m4 paxutils.m4
-
-if [ -d rmt ]; then
-   :
-else
-   mkdir rmt
-fi
-
-for dir in doc rmt lib tests
-do
-	copy_files ${PAXUTILS_SRCDIR}/$dir $dir
-done
-
-copy_files ${PAXUTILS_SRCDIR}/paxlib lib pax
-
 # Get gnulib files.
 
 case ${GNULIB_SRCDIR--} in
@@ -372,6 +350,12 @@ esac
 gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
 <$gnulib_tool || exit
 
+ensure_dir_exists()
+{
+  d=`dirname $dst`
+  test -d "$d" || mkdir -p -- "$d"
+}
+
 symlink_to_gnulib()
 {
   src=$GNULIB_SRCDIR/$1
@@ -388,6 +372,7 @@ symlink_to_gnulib()
       test -f "$dst" &&
       cmp -s "$src" "$dst" || {
 	echo "$0: cp -fp $src $dst" &&
+	ensure_dir_exists $dst &&
 	cp -fp "$src" "$dst"
       }
     else
@@ -410,6 +395,7 @@ symlink_to_gnulib()
 	esac
 
 	echo "$0: ln -fs $dot_dots$src $dst" &&
+	ensure_dir_exists $dst &&
 	ln -fs "$dot_dots$src" "$dst"
       }
     fi
@@ -592,6 +578,28 @@ slurp $bt2 $bt || exit
 
 rm -fr $bt $bt2 || exit
 
+# Import from paxutils
+copy_files ${PAXUTILS_SRCDIR}/m4 m4
+echo "$0: Creating m4/paxutils.m4"
+(echo "# This file is generated automatically. Please, do not edit."
+ echo "#"
+ echo "AC_DEFUN([${package}_PAXUTILS],["
+ cat ${PAXUTILS_SRCDIR}/m4/DISTFILES | sed '/^#/d;s/\(.*\)\.m4/pu_\1/' | tr a-z A-Z
+ echo "])") > ./m4/paxutils.m4
+ignorefile m4 paxutils.m4
+
+if [ -d rmt ]; then
+   :
+else
+   mkdir rmt
+fi
+
+for dir in doc rmt lib tests
+do
+	copy_files ${PAXUTILS_SRCDIR}/$dir $dir
+done
+
+copy_files ${PAXUTILS_SRCDIR}/paxlib lib pax
 
 # Reconfigure, getting other files.