2004-09-23 Simon Josefsson <jas@extundo.com>

        * gnulib-tool (--import): Make sure *.m4 end up in m4/ by default.

diff --git a/ChangeLog b/ChangeLog
index 4ee30e33f368ad324f7b59985ba11d72fba7173a..37c4dddc34a8f2f431ae1f1e86b7118900ade2cb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-23  Simon Josefsson  <jas@extundo.com>
+
+       * gnulib-tool (--import): Make sure *.m4 end up in m4/ by default.
+
 2004-09-22  Bruno Haible  <bruno@clisp.org>
 
        * modules/*: Add 'License' field.

diff --git a/gnulib-tool b/gnulib-tool
index 53c2e840aca7a9aaa73408cf243ed24458297a74..76b94ab06b7c0354d10f3268f6bf6464f740da58 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2004-09-22 15:11:04 $'
+cvsdatestamp='$Date: 2004-09-23 16:15:07 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 
@@ -625,7 +625,7 @@ case $mode in
 
        # Set up m4 base.
        test -z "$m4base" && m4base="$ac_m4base"
-       test -z "$sourcebase" && m4base="m4"
+       test -z "$m4base" && m4base="m4"
        test -d "$destdir/$m4base" || \
            (test -z "$dry_run" && mkdir "$destdir/$m4base") || \
            func_fatal_error "m4 base $destdir/$m4base doesn't exist"