Pull my changes from coreutils:

bootstrap: fix typo to enable use of $gnulib_tool_option_extras.
* build-aux/bootstrap (gnulib_tool_options): Add a space before the
use of $gnulib_tool_option_extras, so that it's separated from the
preceding argument.

Fix bootstrap failure to handle files like lib/uniwidth/cjk.h.
* build-aux/bootstrap (cp_mark_as_generated): Create any required
parent destination directories before copying a file into place.

diff --git a/ChangeLog b/ChangeLog
index 2fc8c61..e2c33ea 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2007-11-18  Jim Meyering  <meyering@redhat.com>
+
+       Pull my changes from coreutils:
+       bootstrap: fix typo to enable use of $gnulib_tool_option_extras.
+       * build-aux/bootstrap (gnulib_tool_options): Add a space before the
+       use of $gnulib_tool_option_extras, so that it's separated from the
+       preceding argument.
+
+       Fix bootstrap failure to handle files like lib/uniwidth/cjk.h.
+       * build-aux/bootstrap (cp_mark_as_generated): Create any required
+       parent destination directories before copying a file into place.
+
 2007-11-18  Sergey Poznyakoff  <gray@gnu.org.ua>
 
        bootstrap: work also with 4-argument variant of AC_INIT

diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index 1034ca3..6b9d2a3 100755 (executable)
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -367,6 +367,11 @@ cp_mark_as_generated()
       *)                  c1=     ; c2=     ;;
     esac
 
+    # If the destination directory doesn't exist, create it.
+    # This is required at least for "lib/uniwidth/cjk.h".
+    dst_dir=`dirname "$cp_dst"`
+    test -d "$dst_dir" || mkdir -p "$dst_dir"
+
     if test -z "$c1"; then
       cmp -s "$cp_src" "$cp_dst" || {
        echo "$0: cp -f $cp_src $cp_dst" &&
@@ -488,7 +493,7 @@ gnulib_tool_options="\
  --source-base $bt/lib/\
  --tests-base $bt/tests\
  --local-dir $local_gl_dir\
-$gnulib_tool_option_extras\
+ $gnulib_tool_option_extras\
 "
 echo "$0: $gnulib_tool $gnulib_tool_options --import ..."
 $gnulib_tool $gnulib_tool_options --import $gnulib_modules &&