Make chdir-safer.c slightly safer.

[pspp] / gnulib-tool

diff --git a/gnulib-tool b/gnulib-tool
index ad2d6dbd04c160536da4da1231bf264914f36dd5..8e6fec4412e1aeb2f732725ebf96e04d4c092319 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -1262,8 +1262,7 @@ func_get_filelist ()
   echo m4/gnulib-common.m4
   case "$autoconf_minversion" in
     2.59)
-      #echo m4/onceonly.m4
-      echo m4/onceonly_2_57.m4
+      echo m4/onceonly.m4
       ;;
   esac
 }
@@ -2047,6 +2046,7 @@ func_emit_initmacro_start ()
   # We let automake know about the files to be distributed through the
   # EXTRA_lib_SOURCES variable.
   echo "  m4_pushdef([AC_LIBSOURCES], m4_defn([${macro_prefix_arg}_LIBSOURCES]))"
+  echo "  gl_COMMON"
 }
 
 # func_emit_initmacro_end macro_prefix
@@ -2671,7 +2671,7 @@ func_import ()
           if test -n "$already_present"; then
             echo "Updating file $g (backup in ${g}~)"
           else
-            echo "Replacing file $g (non-gnulib code backuped in ${g}~) !!"
+            echo "Replacing file $g (non-gnulib code backed up in ${g}~) !!"
           fi
           mv -f "$destdir/$g" "$destdir/${g}~" || func_fatal_error "failed"
           if { test -n "$symbolic" \
@@ -2687,7 +2687,7 @@ func_import ()
           if test -n "$already_present"; then
             echo "Update file $g (backup in ${g}~)"
           else
-            echo "Replace file $g (non-gnulib code backuped in ${g}~) !!"
+            echo "Replace file $g (non-gnulib code backed up in ${g}~) !!"
           fi
         fi
       fi