From: Bruno Haible Date: Sat, 29 Jul 2006 13:10:38 +0000 (+0000) Subject: Avoid creating an empty doc directory. X-Git-Tag: cvs-readonly~2116 X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=b0d3c1545196ae640d1f6de6c084f15812a9650a;p=gnulib.git Avoid creating an empty doc directory. --- diff --git a/ChangeLog b/ChangeLog index 48dc54d01..4e6e6d7ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2006-07-29 Bruno Haible + * gnulib-tool (func_import): Don't create the $docbase directory if + there is no file to store there. + +2006-07-29 Bruno Haible + * gnulib-tool (func_usage): Revert most of the 2006-07-15 change. Categorize the options by when they are useful. diff --git a/gnulib-tool b/gnulib-tool index 6af18fe95..4b814de11 100755 --- 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