diff options
| author | Bruno Haible <bruno@clisp.org> | 2005-03-07 19:47:24 +0000 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2009-06-23 12:12:21 +0200 |
| commit | fd667c033144db7ae63127e56249bc8bfdb3a86e (patch) | |
| tree | 8d165629dcd74d23adf4ac0662e4f5c55eb81c15 /gettext-tools/misc | |
| parent | 8f5743c4adfed2dddc4cce6a7d492e3db6a203ca (diff) | |
| download | external_gettext-fd667c033144db7ae63127e56249bc8bfdb3a86e.zip external_gettext-fd667c033144db7ae63127e56249bc8bfdb3a86e.tar.gz external_gettext-fd667c033144db7ae63127e56249bc8bfdb3a86e.tar.bz2 | |
Aesthetics: Don't insert too many spaces.
Diffstat (limited to 'gettext-tools/misc')
| -rw-r--r-- | gettext-tools/misc/ChangeLog | 9 | ||||
| -rw-r--r-- | gettext-tools/misc/gettextize.in | 12 |
2 files changed, 15 insertions, 6 deletions
diff --git a/gettext-tools/misc/ChangeLog b/gettext-tools/misc/ChangeLog index 671b8c9..f8869b2 100644 --- a/gettext-tools/misc/ChangeLog +++ b/gettext-tools/misc/ChangeLog @@ -1,5 +1,14 @@ 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 AM_GNU_GETTEXT_VERSION. Suggested by Alexandre Duret-Lutz <adl@src.lip6.fr>. diff --git a/gettext-tools/misc/gettextize.in b/gettext-tools/misc/gettextize.in index 8b950d6..a97e58f 100644 --- 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 |