Aesthetics: Don't insert too many spaces.

diff --git a/gettext-tools/misc/ChangeLog b/gettext-tools/misc/ChangeLog
index 671b8c9e1fe0751daf7c2ac25e4fcd989d9aed32..f8869b2c5c762b0f542f8a6436da04ee03871756 100644 (file)
--- a/gettext-tools/misc/ChangeLog
+++ b/gettext-tools/misc/ChangeLog
@@ -1,3 +1,12 @@
+2005-03-05  Bruno Haible  <bruno@clisp.org>
+
+       * gettextize.in: When adding items to EXTRA_DIST, SUBDIRS,
+       DIST_SUBDIRS, ACLOCAL_AMFLAGS in Makefile.am, optionally remove one
+       space after the added items. When adding items to AC_CONFIG_FILES,
+       AC_OUTPUT in configure.ac, remove don't insert an extra space after
+       the added items.
+       Suggested by Alexandre Duret-Lutz <adl@src.lip6.fr>.
+
 2005-03-05  Bruno Haible  <bruno@clisp.org>
 
        * gettextize.in: Emit brackets around the argument of

diff --git a/gettext-tools/misc/gettextize.in b/gettext-tools/misc/gettextize.in
index 8b950d6c9accee4d15cab125aa229137889a7fad..a97e58f60f5b4ba5299e4508208e7b61e83f6427 100644 (file)
--- a/gettext-tools/misc/gettextize.in
+++ b/gettext-tools/misc/gettextize.in
@@ -768,7 +768,7 @@ if test -f "$srcdir/Makefile.am"; then
         func_backup "$m4dir/Makefile.am"
         rm -f "$srcdir/$m4dir/Makefile.am"
         if grep '^EXTRA_DIST[  ]*=' "$srcdir/$m4dir/Makefile.am~" > /dev/null; then
-          sed -e "s%^\(EXTRA_DIST[     ]*=\)%\\1$added_m4files %" < "$srcdir/$m4dir/Makefile.am~" > "$srcdir/$m4dir/Makefile.am"
+          sed -e "s%^\(EXTRA_DIST[     ]*=\) \\?%\\1$added_m4files %" < "$srcdir/$m4dir/Makefile.am~" > "$srcdir/$m4dir/Makefile.am"
           $do_changelog && func_m4ChangeLog_add_entry "        * Makefile.am (EXTRA_DIST): Add the new files."
         else
           (cat "$srcdir/$m4dir/Makefile.am~"; echo; echo "EXTRA_DIST =$added_m4files") > "$srcdir/$m4dir/Makefile.am"
@@ -828,7 +828,7 @@ if test -f "$srcdir/Makefile.am"; then
 
   if test -n "$added_directories"; then
     if grep '^SUBDIRS[         ]*=' "$srcdir/Makefile.am" > /dev/null; then
-      sed -e "s%^\(SUBDIRS[    ]*=\)%\\1$added_directories %" < "$srcdir/Makefile.am" > "$srcdir/Makefile.am.tmp"
+      sed -e "s%^\(SUBDIRS[    ]*=\) \\?%\\1$added_directories %" < "$srcdir/Makefile.am" > "$srcdir/Makefile.am.tmp"
       func_modify_Makefile_am "(SUBDIRS): Add "`echo $added_directories | sed -e 's/ /, /g'`'.'
     else
       (cat "$srcdir/Makefile.am"; echo; echo "SUBDIRS =$added_directories") > "$srcdir/Makefile.am.tmp"
@@ -854,7 +854,7 @@ if test -f "$srcdir/Makefile.am"; then
   fi
   if test -n "$added_directories"; then
     if grep '^DIST_SUBDIRS[    ]*=' "$srcdir/Makefile.am" > /dev/null; then
-      sed -e "s%^\(DIST_SUBDIRS[       ]*=\)%\\1$added_directories %" < "$srcdir/Makefile.am" > "$srcdir/Makefile.am.tmp"
+      sed -e "s%^\(DIST_SUBDIRS[       ]*=\) \\?%\\1$added_directories %" < "$srcdir/Makefile.am" > "$srcdir/Makefile.am.tmp"
       func_modify_Makefile_am "(DIST_SUBDIRS): Add "`echo $added_directories | sed -e 's/ /, /g'`'.'
     fi
   fi
@@ -877,7 +877,7 @@ if test -f "$srcdir/Makefile.am"; then
   fi
   if test -z "$m4dir_is_next"; then
     if grep '^ACLOCAL_AMFLAGS[         ]*=' "$srcdir/Makefile.am" > /dev/null; then
-      sed -e "s%^\(ACLOCAL_AMFLAGS[    ]*=\)%\\1 -I $m4dir %" < "$srcdir/Makefile.am" > "$srcdir/Makefile.am.tmp"
+      sed -e "s%^\(ACLOCAL_AMFLAGS[    ]*=\) \\?%\\1 -I $m4dir %" < "$srcdir/Makefile.am" > "$srcdir/Makefile.am.tmp"
       func_modify_Makefile_am "(ACLOCAL_AMFLAGS): Add -I $m4dir."
     else
       (cat "$srcdir/Makefile.am"; echo; echo "ACLOCAL_AMFLAGS = -I $m4dir") > "$srcdir/Makefile.am.tmp"
@@ -973,11 +973,11 @@ b
 :a
 n
 ba'
-    sed -e "s%^\\(AC_CONFIG_FILES([^])\\,]*\\)%\\1$added_acoutput %$sedprog" < "$srcdir/$configure_in" > "$srcdir/$configure_in.tmp"
+    sed -e "s%^\\(AC_CONFIG_FILES([^])\\,]*\\)%\\1$added_acoutput%$sedprog" < "$srcdir/$configure_in" > "$srcdir/$configure_in.tmp"
     func_modify_configure_in "(AC_CONFIG_FILES): Add "`echo $added_acoutput | sed -e 's/ /, /g'`'.'
   else
     if grep '^AC_OUTPUT(' "$srcdir/$configure_in" > /dev/null; then
-      sed -e "s%^\\(AC_OUTPUT([^])\\,]*\\)%\\1$added_acoutput %" < "$srcdir/$configure_in" > "$srcdir/$configure_in.tmp"
+      sed -e "s%^\\(AC_OUTPUT([^])\\,]*\\)%\\1$added_acoutput%" < "$srcdir/$configure_in" > "$srcdir/$configure_in.tmp"
       func_modify_configure_in "(AC_OUTPUT): Add "`echo $added_acoutput | sed -e 's/ /, /g'`'.'
     else
       please="$please