92-backslash-z.patch

[Akim Demaille]

I was wondering whether the leading extra space in var defs was due to
some broken initialization, of some issues in pretty printing.  The
latter is responsible.

FWIW, I compared my Makefile.ins from 30 versions ago (in the sense of
my home prcs repo) to the current ones, and we have recovered the
Makefile.ins from before my variable changes.  So I can now state that
my changes are semantically transparent (which I wouldn't have said
before patch 91).

Index: ChangeLog
from  Akim Demaille  <address@hidden>
        
        * automake.in (&pretty_print_internal): Don't output useless
        spaces.
        (define_pretty_variable): Don't issue the space after the `=' sign
        to avoid trailing spaces in Makefile.ins.
        
Index: Makefile.in
--- Makefile.in Wed, 28 Feb 2001 23:42:01 +0100 akim (am/h/16_Makefile.i 1.29 
644)
+++ Makefile.in Thu, 01 Mar 2001 00:14:41 +0100 akim (am/h/16_Makefile.i 1.29 
644)
@@ -119,24 +119,24 @@
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_CLEAN_FILES =  automake aclocal
-SCRIPTS =  $(bin_SCRIPTS)
+CONFIG_CLEAN_FILES = automake aclocal
+SCRIPTS = $(bin_SCRIPTS)
 
-DIST_SOURCES = 
+DIST_SOURCES =
 TEXI2DVI = texi2dvi
 INFO_DEPS = automake.info
 DVIS = automake.dvi
 TEXINFOS = automake.texi
-DATA =  $(dist_pkgdata_DATA) $(dist_script_DATA)
+DATA = $(dist_pkgdata_DATA) $(dist_script_DATA)
 
-DIST_COMMON =  README $(dist_pkgdata_DATA) $(dist_script_DATA) AUTHORS \
+DIST_COMMON = README $(dist_pkgdata_DATA) $(dist_script_DATA) AUTHORS \
 COPYING ChangeLog INSTALL Makefile.am Makefile.in NEWS README-alpha \
 THANKS TODO aclocal.in aclocal.m4 ansi2knr.1 ansi2knr.c automake.in \
 compile config.guess config.sub configure configure.in depcomp \
 elisp-comp install-sh mdate-sh missing mkinstalldirs py-compile \
 stamp-vti texinfo.tex version.texi ylwrap
 
-DIST_SUBDIRS =  $(SUBDIRS)
+DIST_SUBDIRS = $(SUBDIRS)
 all: all-recursive
 .SUFFIXES:
 .SUFFIXES: .dvi .info .ps .texi .texinfo .txi
@@ -147,7 +147,7 @@
        cd $(top_builddir) \
          && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) 
./config.status
 
-$(ACLOCAL_M4):  configure.in 
+$(ACLOCAL_M4): configure.in 
        cd $(srcdir) && $(ACLOCAL)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
Index: automake.in
--- automake.in Wed, 28 Feb 2001 23:42:01 +0100 akim (am/f/39_automake.i 1.99 
755)
+++ automake.in Thu, 01 Mar 2001 00:14:04 +0100 akim (am/f/39_automake.i 1.99 
755)
@@ -5573,7 +5573,6 @@ sub pretty_print_internal
     my $fill_length = length ($fill);
     $fill_length += 7 * ($fill =~ tr/\t/\t/d);
 
-    my $bol = $head eq '';
     foreach (@values)
     {
        # "71" because we also print a space.
@@ -5581,13 +5580,11 @@ sub pretty_print_internal
        {
            $result .= " \\\n" . $fill;
            $column = $fill_length;
-           $bol = 1;
+           $separate = 0;
        }
-
-       $result .= ' ' unless $bol;
+       $result .= ' ' if $result =~ /\S\z/;
        $result .= $_;
        $column += length ($_) + 1;
-       $bol = 0;
     }
 
     $result .= "\n";
@@ -6235,7 +6232,7 @@ sub define_pretty_variable
            ${$conditional{$var}}{$cond} = $contents{$var};
        }
         my $make_condition = &make_condition ($cond);
-       &pretty_print ($make_condition . $var . ' = ',
+       &pretty_print ($make_condition . $var . ' =',
                       $make_condition, @value);
        $content_seen{$var} = 1;
     }
Index: m4/Makefile.in
--- m4/Makefile.in Wed, 28 Feb 2001 23:42:01 +0100 akim (am/h/15_Makefile.i 
1.21 644)
+++ m4/Makefile.in Thu, 01 Mar 2001 00:14:41 +0100 akim (am/h/15_Makefile.i 
1.21 644)
@@ -90,11 +90,11 @@
 EXTRA_DIST = $(m4data_DATA)
 subdir = m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_CLEAN_FILES = 
-DIST_SOURCES = 
-DATA =  $(m4data_DATA)
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DATA = $(m4data_DATA)
 
-DIST_COMMON =  Makefile.am Makefile.in
+DIST_COMMON = Makefile.am Makefile.in
 
 all: all-am
 .SUFFIXES:
Index: tests/Makefile.in
--- tests/Makefile.in Wed, 28 Feb 2001 23:42:01 +0100 akim (am/h/14_Makefile.i 
1.24 644)
+++ tests/Makefile.in Thu, 01 Mar 2001 00:14:41 +0100 akim (am/h/14_Makefile.i 
1.24 644)
@@ -359,9 +359,9 @@
 EXTRA_DIST = defs ChangeLog-old $(TESTS)
 subdir = tests
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_CLEAN_FILES = 
-DIST_SOURCES = 
-DIST_COMMON =  Makefile.am Makefile.in
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DIST_COMMON = Makefile.am Makefile.in
 
 all: all-am
 .SUFFIXES: