2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 01e062d82..bcc51118f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-11-05  Jim Meyering  <meyering@redhat.com>
 
+	Fix bootstrap failure to handle files like lib/uniwidth/cjk.h.
+	* bootstrap (cp_mark_as_generated): Create any required parent
+	destination directories before copying a file into place.
+
 	* src/c99-to-c89.diff: Adjust offsets.
 
 	Don't use GNU-sed-specific \< \> operators here, either.
diff --git a/bootstrap b/bootstrap
index 0e2bd34fd..110c77a7c 100755
--- a/bootstrap
+++ b/bootstrap
@@ -366,6 +366,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" &&