Avoid creating an empty doc directory.

diff --git a/ChangeLog b/ChangeLog
index 48dc54d01559f3d9628d08ba6ca2139f7053314a..4e6e6d7eed26dcd0d8017e7288818e54f2ef95f2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-29  Bruno Haible  <bruno@clisp.org>
+
+       * gnulib-tool (func_import): Don't create the $docbase directory if
+       there is no file to store there.
+
 2006-07-29  Bruno Haible  <bruno@clisp.org>
 
        * gnulib-tool (func_usage): Revert most of the 2006-07-15 change.

diff --git a/gnulib-tool b/gnulib-tool
index 6af18fe95ac1369bed07f2402a3655bfcee19b34..4b814de11884fa88bd77ba2a11aa7a3df00ae253 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2006-07-29 13:04:18 $'
+cvsdatestamp='$Date: 2006-07-29 13:10:38 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 
@@ -1133,12 +1133,15 @@ func_import ()
       echo "Create directory $destdir/$m4base"
     fi
   fi
-  if test ! -d "$destdir/$docbase"; then
-    if $doit; then
-      echo "Creating directory $destdir/$docbase"
-      mkdir "$destdir/$docbase" || func_fatal_error "failed"
-    else
-      echo "Create directory $destdir/$docbase"
+  docfiles=`echo "$files" | sed -n -e 's,^doc/,,p'`
+  if test -n "$docfiles"; then
+    if test ! -d "$destdir/$docbase"; then
+      if $doit; then
+        echo "Creating directory $destdir/$docbase"
+        mkdir "$destdir/$docbase" || func_fatal_error "failed"
+      else
+        echo "Create directory $destdir/$docbase"
+      fi
     fi
   fi
   if test -n "$inctests"; then