* automake.in (&transform): Use `my', not `local'.

(&transform_cond): New.
(&get_object_extension, &handle_texinfo, &handle_tags)
(&handle_dist_worker, &handle_dist, &add_depend2, &handle_clean)
(&handle_tests_dejagnu): Use it.
* texinfos.am, lisp.am, header.am, dist.am, distdir.am, depend2.am
* dejagnu.am, data.am, clean.am: Adjust to the new syntax.

diff --git a/ChangeLog b/ChangeLog
index 8a2a22af431f4b274bd15066a0b95159781550a2..6afc6681f2405c149f0ee1a7617e7b2ef37f0b86 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2001-02-09  Akim Demaille  <akim@epita.fr>
+
+       * automake.in (&transform): Use `my', not `local'.
+       (&transform_cond): New.
+       (&get_object_extension, &handle_texinfo, &handle_tags)
+       (&handle_dist_worker, &handle_dist, &add_depend2, &handle_clean)
+       (&handle_tests_dejagnu): Use it.
+       * texinfos.am, lisp.am, header.am, dist.am, distdir.am, depend2.am
+       * dejagnu.am, data.am, clean.am: Adjust to the new syntax.
+
 2001-02-09  Akim Demaille  <akim@epita.fr>
 
        * automake.in: Various formatting changes, and modernization of

diff --git a/Makefile.in b/Makefile.in
index 49a833dcdb2309e05649069acdde05a0e4809b0e..9756e77e7fc33d5d022410729103c4aa2b675461 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,6 +1,6 @@
 # Makefile.in generated automatically by automake 1.4c from Makefile.am
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -316,7 +316,7 @@ install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
        @$(NORMAL_INSTALL)
        $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
        @list='$(dist_pkgdata_DATA)'; for p in $$list; do \
-         if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
          f="`echo $$p | sed -e 's|^.*/||'`"; \
          echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \
          $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \
@@ -334,7 +334,7 @@ install-dist_scriptDATA: $(dist_script_DATA)
        @$(NORMAL_INSTALL)
        $(mkinstalldirs) $(DESTDIR)$(scriptdir)
        @list='$(dist_script_DATA)'; for p in $$list; do \
-         if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
          f="`echo $$p | sed -e 's|^.*/||'`"; \
          echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(scriptdir)/$$f"; \
          $(INSTALL_DATA) $$d$$p $(DESTDIR)$(scriptdir)/$$f; \
@@ -407,7 +407,6 @@ tags-recursive:
 
 tags: TAGS
 
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
        list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
        unique=`for i in $$list; do \
@@ -560,10 +559,8 @@ installdirs-am:
 
 mostlyclean-generic:
 
-
 clean-generic:
 
-
 distclean-generic:
        -rm -f Makefile $(CONFIG_CLEAN_FILES)
        -rm -f config.cache config.log stamp-h stamp-h[0-9]*
@@ -693,4 +690,3 @@ path-check: distdir
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
-

diff --git a/automake.in b/automake.in
index 30b0c5f97117bd933c6edf0cd89d975fe21b242f..a24658d29910ecda91668f9a7713d6b6eb2493d3 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -851,8 +851,9 @@ sub get_object_extension
        local ($xform) = &transform ('DEFAULT_INCLUDES' => $default_include);
        $output_vars .= &file_contents ('comp-vars', $xform);
 
-       $xform = $seen_objext ? 's/^OBJEXT//;' : 's/^OBJEXT.*$//;';
-       $output_rules .= &file_contents ('compile', $xform);
+       $output_rules .=
+         &file_contents ('compile',
+                         &transform_cond ('OBJEXT' => $seen_objext));
 
        # If using X, include some extra variable definitions.  NOTE
        # we don't want to force these into CFLAGS or anything,
@@ -2335,15 +2336,7 @@ sub handle_texinfo
 
     # Set transform for including texinfos.am.  First, handle --cygnus
     # stuff.
-    local ($xform);
-    if ($cygnus_mode)
-    {
-       $xform = 's/^NOTCYGNUS.*$//; s/^CYGNUS//;';
-    }
-    else
-    {
-       $xform = 's/^CYGNUS.*$//; s/^NOTCYGNUS//;';
-    }
+    my $xform = &transform_cond ('CYGNUS' => $cygnus_mode);
 
     # Handle location of texinfo.tex.
     local ($need_texi_file) = 0;
@@ -2541,17 +2534,9 @@ sub handle_tags
                $config .= &basename ($one_hdr);
            }
        }
-       local $xform = &transform ('CONFIG' => $xform,
-                                  'DIRS'   => join (' ', @tag_deps));
-
-       if (&variable_defined ('SUBDIRS'))
-       {
-           $xform .= 's/^SUBDIRS//;';
-       }
-       else
-       {
-           $xform .= 's/^SUBDIRS.*$//;';
-       }
+       my $xform = &transform ('CONFIG' => $xform,
+                               'DIRS'   => join (' ', @tag_deps));
+       $xform .= &transform_cond ('SUBDIRS' => &variable_defined ('SUBDIRS'));
 
        $output_rules .= &file_contents ('tags', $xform);
        $output_rules .= &file_contents ('tags-clean');
@@ -2586,23 +2571,8 @@ sub handle_dist_worker
     my $xform = '';
 
     # Initialization; only at top level.
-    if ($relative_dir eq '.')
-    {
-        $xform .= 's/\@TOPDIR\@//g;';
-    }
-    else
-    {
-        $xform .= 's/\@TOPDIR\@.*//g;';
-    }
-
-    if (defined $options{'check-news'})
-    {
-        $xform .= 's/\@CK-NEWS\@//g;';
-    }
-    else
-    {
-        $xform .= 's/\@CK-NEWS\@.*//g;';
-    }
+    my $xform = &transform_cond ('TOPDIR'  => ($relative_dir eq '.'),
+                                'CK-NEWS' => defined $options{'check-news'});
 
     # Scan EXTRA_DIST to see if we need to distribute anything from a
     # subdir.  If so, add it to the list.  I didn't want to do this
@@ -2646,17 +2616,6 @@ sub handle_dist_worker
         $xform .= 's/.*\@DISTDIRS\@.*//g;';
     }
 
-    if ($cygnus_mode)
-    {
-       $xform .= 's/\@CYGNUS\@\t*/\t/g;';
-        $xform .= 's/.*\@NCYGNUS\@.*//g;';
-    }
-    else
-    {
-       $xform .= 's/\@NCYGNUS\@\t*/\t/g;';
-        $xform .= 's/.*\@CYGNUS\@.*//g;';
-    }
-
     # If we have SUBDIRS, create all dist subdirectories and do
     # recursive build.
     if (&variable_defined ('SUBDIRS'))
@@ -2693,19 +2652,17 @@ sub handle_dist_worker
            &define_pretty_variable ('DIST_SUBDIRS', '', '$(SUBDIRS)');
        }
 
-       $xform .= ('s/\@SUBDIRS\@//g;'
-                  . &transform ('DIST_SUBDIR_NAME'
-                                => $dist_subdir_name,
-                                'TOP_DISTDIR'
-                                => (($relative_dir eq '.')
-                                    ? 'distdir' : 'top_distdir')));
-    }
-    else
-    {
-       $xform .= 's/\@SUBDIRS\@.*//g;';
+       my $top_distdir = ($relative_dir eq '.') ? 'distdir' : 'top_distdir';
+       $xform .= &transform ('DIST_SUBDIR_NAME' => $dist_subdir_name,
+                             'TOP_DISTDIR'      => $top_distdir);
     }
 
-    $output_rules .= &file_contents ('distdir', $xform);
+    $output_rules .=
+      &file_contents ('distdir',
+                     $xform
+                     . &transform_cond ('CYGNUS' => $cygnus_mode,
+                                        'SUBDIRS'
+                                        => &variable_defined ('SUBDIRS')));
 
     # If the target `dist-hook' exists, make sure it is run.  This
     # allows users to do random weird things to the distribution
@@ -2832,24 +2789,9 @@ sub handle_dist
     if ($relative_dir eq '.')
     {
        # Rule to check whether a distribution is viable.
-       local ($xform) = '';
-
-       if (&target_defined ('distcheck-hook'))
-       {
-           $xform .= 's/^DISTHOOK//;';
-       }
-       else
-       {
-           $xform .= 's/^DISTHOOK.*$//;';
-       }
-       if ($seen_gettext)
-       {
-           $xform .= 's/^GETTEXT//;';
-       }
-       else
-       {
-           $xform .= 's/^GETTEXT.*$//;';
-       }
+       my ($xform) =
+         &transform_cond ('DISTHOOK' => &target_defined ('distcheck-hook'),
+                          'GETTEXT'  => $seen_gettext);
 
        # Arg, this file should have been named `distcheck'.
        $output_rules .= &file_contents ('dist', $xform);
@@ -2891,11 +2833,11 @@ sub add_depend2
     my $flag = $language_map{"$lang-flags"};
 
     # First include code for ordinary objects.
-    local ($xform, $ext);
+    my ($xform, $ext);
     $xform = &transform ('PFX'  => $pfx,
                         'FPFX' => $fpfx);
-    $xform .= $seen_objext  ? 's/^OBJEXT//;'  : 's/^OBJEXT.*$//;';
-    $xform .= $seen_libtool ? 's/^LIBTOOL//;' : 's/^LIBTOOL.*$//;';
+    $xform .= &transform_cond ('OBJEXT'  => $seen_objext,
+                              'LIBTOOL' => $seen_libtool);
 
     # This function can be called even when we don't want dependency
     # tracking.  This happens when we need an explicit rule for some
@@ -3869,14 +3811,8 @@ sub handle_clean
     # Don't include `MAINTAINER'; it is handled specially below.
     foreach $name ('MOSTLY', '', 'DIST')
     {
-       if (! &variable_defined ($name . 'CLEANFILES'))
-       {
-           $xform .= 's/^' . $name . 'CLEAN.*$//;';
-       }
-       else
-       {
-           $xform .= 's/^' . $name . 'CLEAN//;';
-       }
+      $xform .= &transform_cond ("${name}CLEAN"
+                                => &variable_defined ("${name}CLEANFILES"));
     }
 
     # Built sources are automatically removed by maintainer-clean.
@@ -3899,16 +3835,11 @@ sub handle_clean
                   . 's,\@MFILES\@,' . join (' ', @maintainer_clean_files)
                   . ',;');
     }
-    if ($recursive_install)
-    {
-       $xform .= 's/^NSUBDIRS.*$//;';
-    }
-    else
-    {
-       $xform .= 's/^NSUBDIRS//;';
-    }
 
-    $output_rules .= &file_contents ('clean', $xform);
+    $output_rules .=
+      &file_contents ('clean',
+                     $xform
+                     . &transform_cond ('SUBDIRS' => $recursive_install));
 
     foreach ('clean', 'distclean', 'mostlyclean', 'maintainer-clean')
       {
@@ -3976,16 +3907,9 @@ sub handle_tests_dejagnu
 {
     push (@check_tests, 'check-DEJAGNU');
 
-    local ($xform);
-    if ($cygnus_mode)
-    {
-        $xform = 's/^CYGNUS//;';
-    }
-    else
-    {
-        $xform = 's/^CYGNUS.*$//;';
-    }
-    $output_rules .= &file_contents ('dejagnu', $xform);
+    $output_rules .=
+      &file_contents ('dejagnu',
+                     &transform_cond ('CYGNUS' => $cygnus_mode));
 
     # In Cygnus mode, these are found in the build tree.
     # Otherwise they are looked for in $PATH.
@@ -7097,24 +7021,50 @@ sub file_contents
 }
 
 
+# $REGEXP
 # &transform (%PAIRS)
 # -------------------
 # Create a replacement expression suitable for file_contents
 # to replace each key of %PAIRS by its value.
-sub transform
+sub transform (%)
 {
-    local (%pairs) = @_;
-    local ($result) = '';
+    my (%pairs) = @_;
+    my ($result) = '';
 
-    local ($quoted);
-    foreach $pattern (sort keys %pairs)
+    foreach my $token (sort keys %pairs)
     {
-       ($quoted = $pairs{$pattern}) =~ s/(\W)/\\$1/g;
-        $result .= 's,\@' . $pattern . '\@,' . $quoted . ',g;';
+        $result .= "s/\Q\@$token\@\E/\Q$pairs{$token}\E/g;";
     }
     return $result;
 }
 
+
+# $REGEXP
+# &transform_cond (%PAIRS)
+# ------------------------
+# For each pair ($TOKEN => $COND), if $COND is positive then create a regexp
+# that removes `?$TOKEN?', otherwise that removes the whole line containing
+# `?$TOKEN?'.  Do the converse for the token `?!$TOKEN?'.
+sub transform_cond (%)
+{
+    my (%pairs) = @_;
+    my ($result) = '';
+
+    foreach my $token (sort keys %pairs)
+    {
+        if ($pairs{$token})
+       {
+           $result .= "s/\Q?$token?\E//g;s/^.*\Q?!$token?\E.*\$//g;";
+       }
+       else
+       {
+           $result .= "s/\Q?!$token?\E//g;s/^.*\Q?$token?\E.*\$//g;";
+       }
+    }
+    return $result;
+}
+
+
 # Find all variable prefixes that are used for install directories.  A
 # prefix `zar' qualifies iff:
 # * `zardir' is a variable.
@@ -7421,23 +7371,13 @@ sub am_install_var
                next;
            }
 
-           local ($subdir_xform);
-           if ($strip_subdir)
-           {
-               $subdir_xform = 's/^NOBASE.*$//; s/^BASE//;';
-           }
-           else
-           {
-               $subdir_xform = 's/^BASE.*$//; s/^NOBASE//;';
-           }
-
            $output_rules .=
              &file_contents ($file,
                              &transform ('DIR'  => $X,
                                          'NDIR' => $nodir_name)
+                             . &transform_cond ('BASE' => $strip_subdir)
                              . $ltxform
-                             . $cygxform
-                             . $subdir_xform);
+                             . $cygxform);
 
            push (@uninstall, 'uninstall-' . $X . $primary);
            &depend ('.PHONY', 'uninstall-' . $X . $primary);

diff --git a/clean.am b/clean.am
index d15edc8e25cb7c41b2913f9883692db401e8d1de..a699bc9b1889a8357c1ca184bf6e17c2c999f059 100644 (file)
--- a/clean.am
+++ b/clean.am
@@ -21,17 +21,17 @@
 ## return an error if there are no arguments other than "-f".
 mostlyclean-am: mostlyclean-generic
 mostlyclean-generic:
-MOSTLYCLEAN    -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+?MOSTLYCLEAN?  -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-am: clean-generic mostlyclean-am
 clean-generic:
-CLEAN  -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+?CLEAN?        -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-am: distclean-generic clean-am
 distclean-generic:
        -rm -f Makefile $(CONFIG_CLEAN_FILES)
        -rm -f config.cache config.log stamp-h stamp-h[0-9]*
-DISTCLEAN      -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+?DISTCLEAN?    -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-am: maintainer-clean-generic distclean-am
 maintainer-clean-generic:
@@ -45,7 +45,7 @@ MAINTAINERCLEAN       -test -z "@MCFILES@" || rm -f @MFILES@
 .PHONY: clean mostlyclean distclean maintainer-clean \
 clean-generic mostlyclean-generic distclean-generic maintainer-clean-generic
 
-NSUBDIRSclean: clean-am
-NSUBDIRSdistclean: distclean-am
-NSUBDIRSmostlyclean: mostlyclean-am
-NSUBDIRSmaintainer-clean: maintainer-clean-am
+?!SUBDIRS?clean: clean-am
+?!SUBDIRS?distclean: distclean-am
+?!SUBDIRS?mostlyclean: mostlyclean-am
+?!SUBDIRS?maintainer-clean: maintainer-clean-am

diff --git a/compile.am b/compile.am
index e00f7f28d81036d7e914f86b120b90d765d389df..e9280f00759f4be5bc61994e3dc694ab2249b83a 100644 (file)
--- a/compile.am
+++ b/compile.am
@@ -21,7 +21,7 @@ mostlyclean-compile:
 ## Don't remove 'core.*' because some distributions have eg "core.c".
 ## 4.4BSD systems use `PROG.core'.
        -rm -f *.o core *.core
-OBJEXT -rm -f *.$(OBJEXT)
+?OBJEXT?       -rm -f *.$(OBJEXT)
 
 distclean-am: distclean-compile
 distclean-compile:

diff --git a/data.am b/data.am
index f8a7eca9a2c38c4a419bcc9990a4fafebc245412..3cb224244b9743e0ea70fa1f0a749e152a5d1011 100644 (file)
--- a/data.am
+++ b/data.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright 1994, 1995, 1996, 1998, 1999 Free Software Foundation, Inc.
+## Copyright 1994, 1995, 1996, 1998, 1999, 2001 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -25,8 +25,8 @@ install-@DIR@DATA: $(@DIR@_DATA)
 ## If the _DATA variable has an entry like foo/bar, install it as
 ## $(destdir)/bar, not $(destdir)/foo/bar.  The user can always make a
 ## new dir variable for the latter case.
-BASE     f="`echo $$p | sed -e 's|^.*/||'`"; \
-NOBASE   f="$$p"; \
+?BASE?   f="`echo $$p | sed -e 's|^.*/||'`"; \
+?!BASE?          f="$$p"; \
          echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@NDIR@dir)/$$f"; \
          $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@NDIR@dir)/$$f; \
        done
@@ -34,8 +34,8 @@ NOBASE          f="$$p"; \
 uninstall-@DIR@DATA:
        @$(NORMAL_UNINSTALL)
        @list='$(@DIR@_DATA)'; for p in $$list; do \
-BASE     f="`echo $$p | sed -e 's|^.*/||'`"; \
-NOBASE   f="$$p"; \
+?BASE?   f="`echo $$p | sed -e 's|^.*/||'`"; \
+?!BASE?          f="$$p"; \
          echo " rm -f $(DESTDIR)$(@NDIR@dir)/$$f"; \
          rm -f $(DESTDIR)$(@NDIR@dir)/$$f; \
        done

diff --git a/dejagnu.am b/dejagnu.am
index 1f4cdf5fcb44b818f2366d54118f706ef3b05e16..b8ae10d6f2bc4a8bc0d122323d3a62731a042bec 100644 (file)
--- a/dejagnu.am
+++ b/dejagnu.am
@@ -32,10 +32,10 @@ check-DEJAGNU: site.exp
        EXPECT=$(EXPECT); export EXPECT; \
 ## Allow this to work when expect and DejaGNU are in tree.
 ## Only required when --cygnus in force.
-CYGNUS if [ -f $(top_builddir)/../expect/expect ]; then \
-CYGNUS   TCL_LIBRARY=`CDPATH=: && cd $(top_srcdir)/../tcl/library && pwd`; \
-CYGNUS   export TCL_LIBRARY; \
-CYGNUS fi; \
+?CYGNUS?       if [ -f $(top_builddir)/../expect/expect ]; then \
+?CYGNUS?         TCL_LIBRARY=`CDPATH=: && cd $(top_srcdir)/../tcl/library && pwd`; \
+?CYGNUS?         export TCL_LIBRARY; \
+?CYGNUS?       fi; \
        runtest=$(RUNTEST); \
 ## If runtest can't be found, print a warning but don't die.  It is
 ## pointless to cause a failure if the tests cannot be run at all.

diff --git a/depend2.am b/depend2.am
index e14239c72495863988e02989667fc82cc1b2273f..9a058044864371054ad612990c8a67b884994a97 100644 (file)
--- a/depend2.am
+++ b/depend2.am
@@ -21,8 +21,9 @@
 ## - once per language for generic compilation rules
 ## - once for each file which requires specific flags.
 ##
-## It is worth noting that @AMDEP@ and @AMDEPBACKSLASH@ are not
-## transformed by automake, they are AC_SUBST'ed.
+## It is worth noting that @AMDEPBACKSLASH@ is not transformed by automake,
+## it is AC_SUBST'ed, and @AMDEP@ can be both deactivated by automake,
+## or by AC_SUBST.
 
 @AMDEP@@FPFX@DEPMODE = @@FPFX@DEPMODE@
 
@@ -32,14 +33,14 @@
 @AMDEP@        $(@FPFX@DEPMODE) $(depcomp) @AMDEPBACKSLASH@
        @COMPILE@ -c -o @OBJ@ `test -f @SOURCE@ || echo '$(srcdir)/'`@SOURCE@
 
-LIBTOOL@EXT@.lo:
-LIBTOOL@AMDEP@ source='@SOURCE@' object='@LTOBJ@' libtool=yes @AMDEPBACKSLASH@
-LIBTOOL@AMDEP@ depfile='$(DEPDIR)/@BASE@.Plo' tmpdepfile='$(DEPDIR)/@BASE@.TPlo' @AMDEPBACKSLASH@
-LIBTOOL@AMDEP@ $(@FPFX@DEPMODE) $(depcomp) @AMDEPBACKSLASH@
-LIBTOOL        @LTCOMPILE@ -c -o @LTOBJ@ `test -f @SOURCE@ || echo '$(srcdir)/'`@SOURCE@
-
-OBJEXT@EXT@.obj:
-OBJEXT@AMDEP@  source='@SOURCE@' object='@OBJOBJ@' libtool=no @AMDEPBACKSLASH@
-OBJEXT@AMDEP@  depfile='$(DEPDIR)/@BASE@.Po' tmpdepfile='$(DEPDIR)/@BASE@.TPo' @AMDEPBACKSLASH@
-OBJEXT@AMDEP@  $(@FPFX@DEPMODE) $(depcomp) @AMDEPBACKSLASH@
-OBJEXT @COMPILE@ -c -o @OBJOBJ@ `cygpath -w @SOURCE@`
+?LIBTOOL?@EXT@.lo:
+?LIBTOOL?@AMDEP@       source='@SOURCE@' object='@LTOBJ@' libtool=yes @AMDEPBACKSLASH@
+?LIBTOOL?@AMDEP@       depfile='$(DEPDIR)/@BASE@.Plo' tmpdepfile='$(DEPDIR)/@BASE@.TPlo' @AMDEPBACKSLASH@
+?LIBTOOL?@AMDEP@       $(@FPFX@DEPMODE) $(depcomp) @AMDEPBACKSLASH@
+?LIBTOOL?      @LTCOMPILE@ -c -o @LTOBJ@ `test -f @SOURCE@ || echo '$(srcdir)/'`@SOURCE@
+
+?OBJEXT?@EXT@.obj:
+?OBJEXT?@AMDEP@        source='@SOURCE@' object='@OBJOBJ@' libtool=no @AMDEPBACKSLASH@
+?OBJEXT?@AMDEP@        depfile='$(DEPDIR)/@BASE@.Po' tmpdepfile='$(DEPDIR)/@BASE@.TPo' @AMDEPBACKSLASH@
+?OBJEXT?@AMDEP@        $(@FPFX@DEPMODE) $(depcomp) @AMDEPBACKSLASH@
+?OBJEXT?       @COMPILE@ -c -o @OBJOBJ@ `cygpath -w @SOURCE@`

diff --git a/dist.am b/dist.am
index b3952281b688035b4f77933018412a722ecab5ce..83b14db1541a7b046ec38afff57c97139dd29bf2 100644 (file)
--- a/dist.am
+++ b/dist.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright 1994, 1995, 1996, 1999 Free Software Foundation, Inc.
+## Copyright 1994, 1995, 1996, 1999, 2001 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -15,6 +15,7 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
+
 # This target untars the dist file and tries a VPATH configuration.  Then
 # it guarantees that the distribution is self-contained by making another
 # tarfile.
@@ -31,10 +32,10 @@ distcheck: dist
 ## Undo the write access.
        chmod a-w $(distdir)
        dc_install_base=`CDPATH=: && cd $(distdir)/=inst && pwd` \
-DISTHOOK         && $(MAKE) $(AM_MAKEFLAGS) distcheck-hook \
+?DISTHOOK?       && $(MAKE) $(AM_MAKEFLAGS) distcheck-hook \
          && cd $(distdir)/=build \
          && ../configure --srcdir=.. --prefix=$$dc_install_base \
-GETTEXT            --with-included-gettext \
+?GETTEXT?          --with-included-gettext \
          && $(MAKE) $(AM_MAKEFLAGS) \
          && $(MAKE) $(AM_MAKEFLAGS) dvi \
          && $(MAKE) $(AM_MAKEFLAGS) check \

diff --git a/distdir.am b/distdir.am
index 85e69f318a813f3efbda75312f7e7ce93a9da07e..45be94684cdb3dd1a746002cbffe9268b561a9f4 100644 (file)
--- a/distdir.am
+++ b/distdir.am
@@ -23,15 +23,15 @@ distdir: $(DISTFILES)
 ## For Gnits users, this is pretty handy.  Look at 15 lines
 ## in case some explanatory text is desirable.
 ##
-@TOPDIR@@CK-NEWS@      @if sed 15q $(srcdir)/NEWS | fgrep -e "$(VERSION)" > /dev/null; then :; else \
-@TOPDIR@@CK-NEWS@        echo "NEWS not updated; not releasing" 1>&2; \
-@TOPDIR@@CK-NEWS@        exit 1; \
-@TOPDIR@@CK-NEWS@      fi
+?TOPDIR??CK-NEWS?      @if sed 15q $(srcdir)/NEWS | fgrep -e "$(VERSION)" > /dev/null; then :; else \
+?TOPDIR??CK-NEWS?        echo "NEWS not updated; not releasing" 1>&2; \
+?TOPDIR??CK-NEWS?        exit 1; \
+?TOPDIR??CK-NEWS?      fi
 ##
 ## Only for the top dir.
 ##
-@TOPDIR@       -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir)
-@TOPDIR@       mkdir $(distdir)
+?TOPDIR?       -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir)
+?TOPDIR?       mkdir $(distdir)
 ##
 ##
        $(mkinstalldirs) @DISTDIRS@
@@ -46,8 +46,8 @@ distdir: $(DISTFILES)
 ## distribute could actually be a cross-filesystem symlink -- this can
 ## easily happen if "gettextize" was run on the distribution.
 ##
-@CYGNUS@  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-@NCYGNUS@  d=$(srcdir); \
+?CYGNUS?         if test -f $$file; then d=.; else d=$(srcdir); fi; \
+?!CYGNUS?        d=$(srcdir); \
 ##
          if test -d $$d/$$file; then \
 ## Don't mention $$file in destination argument, since this fails if
@@ -70,13 +70,13 @@ distdir: $(DISTFILES)
 ## directory, then we use `distdir' instead of `top_distdir'; this lets
 ## us work correctly with an enclosing package.
 ##
-@SUBDIRS@      for subdir in $(@DIST_SUBDIR_NAME@); do \
-@SUBDIRS@        if test "$$subdir" = .; then :; else \
-@SUBDIRS@          test -d $(distdir)/$$subdir \
-@SUBDIRS@          || mkdir $(distdir)/$$subdir \
-@SUBDIRS@          || exit 1; \
-@SUBDIRS@          (cd $$subdir && \
-@SUBDIRS@            $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(@TOP_DISTDIR@) distdir=../$(distdir)/$$subdir distdir) \
-@SUBDIRS@            || exit 1; \
-@SUBDIRS@        fi; \
-@SUBDIRS@      done
+?SUBDIRS?      for subdir in $(@DIST_SUBDIR_NAME@); do \
+?SUBDIRS?        if test "$$subdir" = .; then :; else \
+?SUBDIRS?          test -d $(distdir)/$$subdir \
+?SUBDIRS?          || mkdir $(distdir)/$$subdir \
+?SUBDIRS?          || exit 1; \
+?SUBDIRS?          (cd $$subdir && \
+?SUBDIRS?            $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(@TOP_DISTDIR@) distdir=../$(distdir)/$$subdir distdir) \
+?SUBDIRS?            || exit 1; \
+?SUBDIRS?        fi; \
+?SUBDIRS?      done

diff --git a/header.am b/header.am
index 2eb579c55d1a0b3ec53148b6b1b2bd6b254b5a63..27636d281a9db4d352b972cdbc6e440719205107 100644 (file)
--- a/header.am
+++ b/header.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright 1994, 1995, 1996, 1998, 1999 Free Software Foundation, Inc.
+## Copyright 1994, 1995, 1996, 1998, 1999, 2001 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -23,8 +23,8 @@ install-@DIR@HEADERS: $(@DIR@_HEADERS)
        @list='$(@DIR@_HEADERS)'; for p in $$list; do \
 ## A header file can be in the source directory or the build directory.
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-BASE     f="`echo $$p | sed -e 's|^.*/||'`"; \
-NOBASE   f="$$p"; \
+?BASE?   f="`echo $$p | sed -e 's|^.*/||'`"; \
+?!NOBASE?        f="$$p"; \
          echo " $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(@NDIR@dir)/$$f"; \
          $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(@NDIR@dir)/$$f; \
        done
@@ -32,8 +32,8 @@ NOBASE          f="$$p"; \
 uninstall-@DIR@HEADERS:
        @$(NORMAL_UNINSTALL)
        @list='$(@DIR@_HEADERS)'; for p in $$list; do \
-BASE     f="`echo $$p | sed -e 's|^.*/||'`"; \
-NOBASE   f="$$p"; \
+?BASE?   f="`echo $$p | sed -e 's|^.*/||'`"; \
+?!BASE?          f="$$p"; \
          echo " rm -f $(DESTDIR)$(@NDIR@dir)/$$f"; \
          rm -f $(DESTDIR)$(@NDIR@dir)/$$f; \
        done

diff --git a/lib/am/clean.am b/lib/am/clean.am
index d15edc8e25cb7c41b2913f9883692db401e8d1de..a699bc9b1889a8357c1ca184bf6e17c2c999f059 100644 (file)
--- a/lib/am/clean.am
+++ b/lib/am/clean.am
@@ -21,17 +21,17 @@
 ## return an error if there are no arguments other than "-f".
 mostlyclean-am: mostlyclean-generic
 mostlyclean-generic:
-MOSTLYCLEAN    -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+?MOSTLYCLEAN?  -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-am: clean-generic mostlyclean-am
 clean-generic:
-CLEAN  -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+?CLEAN?        -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-am: distclean-generic clean-am
 distclean-generic:
        -rm -f Makefile $(CONFIG_CLEAN_FILES)
        -rm -f config.cache config.log stamp-h stamp-h[0-9]*
-DISTCLEAN      -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+?DISTCLEAN?    -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-am: maintainer-clean-generic distclean-am
 maintainer-clean-generic:
@@ -45,7 +45,7 @@ MAINTAINERCLEAN       -test -z "@MCFILES@" || rm -f @MFILES@
 .PHONY: clean mostlyclean distclean maintainer-clean \
 clean-generic mostlyclean-generic distclean-generic maintainer-clean-generic
 
-NSUBDIRSclean: clean-am
-NSUBDIRSdistclean: distclean-am
-NSUBDIRSmostlyclean: mostlyclean-am
-NSUBDIRSmaintainer-clean: maintainer-clean-am
+?!SUBDIRS?clean: clean-am
+?!SUBDIRS?distclean: distclean-am
+?!SUBDIRS?mostlyclean: mostlyclean-am
+?!SUBDIRS?maintainer-clean: maintainer-clean-am

diff --git a/lib/am/compile.am b/lib/am/compile.am
index e00f7f28d81036d7e914f86b120b90d765d389df..e9280f00759f4be5bc61994e3dc694ab2249b83a 100644 (file)
--- a/lib/am/compile.am
+++ b/lib/am/compile.am
@@ -21,7 +21,7 @@ mostlyclean-compile:
 ## Don't remove 'core.*' because some distributions have eg "core.c".
 ## 4.4BSD systems use `PROG.core'.
        -rm -f *.o core *.core
-OBJEXT -rm -f *.$(OBJEXT)
+?OBJEXT?       -rm -f *.$(OBJEXT)
 
 distclean-am: distclean-compile
 distclean-compile:

diff --git a/lib/am/data.am b/lib/am/data.am
index f8a7eca9a2c38c4a419bcc9990a4fafebc245412..3cb224244b9743e0ea70fa1f0a749e152a5d1011 100644 (file)
--- a/lib/am/data.am
+++ b/lib/am/data.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright 1994, 1995, 1996, 1998, 1999 Free Software Foundation, Inc.
+## Copyright 1994, 1995, 1996, 1998, 1999, 2001 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -25,8 +25,8 @@ install-@DIR@DATA: $(@DIR@_DATA)
 ## If the _DATA variable has an entry like foo/bar, install it as
 ## $(destdir)/bar, not $(destdir)/foo/bar.  The user can always make a
 ## new dir variable for the latter case.
-BASE     f="`echo $$p | sed -e 's|^.*/||'`"; \
-NOBASE   f="$$p"; \
+?BASE?   f="`echo $$p | sed -e 's|^.*/||'`"; \
+?!BASE?          f="$$p"; \
          echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@NDIR@dir)/$$f"; \
          $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@NDIR@dir)/$$f; \
        done
@@ -34,8 +34,8 @@ NOBASE          f="$$p"; \
 uninstall-@DIR@DATA:
        @$(NORMAL_UNINSTALL)
        @list='$(@DIR@_DATA)'; for p in $$list; do \
-BASE     f="`echo $$p | sed -e 's|^.*/||'`"; \
-NOBASE   f="$$p"; \
+?BASE?   f="`echo $$p | sed -e 's|^.*/||'`"; \
+?!BASE?          f="$$p"; \
          echo " rm -f $(DESTDIR)$(@NDIR@dir)/$$f"; \
          rm -f $(DESTDIR)$(@NDIR@dir)/$$f; \
        done

diff --git a/lib/am/dejagnu.am b/lib/am/dejagnu.am
index 1f4cdf5fcb44b818f2366d54118f706ef3b05e16..b8ae10d6f2bc4a8bc0d122323d3a62731a042bec 100644 (file)
--- a/lib/am/dejagnu.am
+++ b/lib/am/dejagnu.am
@@ -32,10 +32,10 @@ check-DEJAGNU: site.exp
        EXPECT=$(EXPECT); export EXPECT; \
 ## Allow this to work when expect and DejaGNU are in tree.
 ## Only required when --cygnus in force.
-CYGNUS if [ -f $(top_builddir)/../expect/expect ]; then \
-CYGNUS   TCL_LIBRARY=`CDPATH=: && cd $(top_srcdir)/../tcl/library && pwd`; \
-CYGNUS   export TCL_LIBRARY; \
-CYGNUS fi; \
+?CYGNUS?       if [ -f $(top_builddir)/../expect/expect ]; then \
+?CYGNUS?         TCL_LIBRARY=`CDPATH=: && cd $(top_srcdir)/../tcl/library && pwd`; \
+?CYGNUS?         export TCL_LIBRARY; \
+?CYGNUS?       fi; \
        runtest=$(RUNTEST); \
 ## If runtest can't be found, print a warning but don't die.  It is
 ## pointless to cause a failure if the tests cannot be run at all.

diff --git a/lib/am/depend2.am b/lib/am/depend2.am
index e14239c72495863988e02989667fc82cc1b2273f..9a058044864371054ad612990c8a67b884994a97 100644 (file)
--- a/lib/am/depend2.am
+++ b/lib/am/depend2.am
@@ -21,8 +21,9 @@
 ## - once per language for generic compilation rules
 ## - once for each file which requires specific flags.
 ##
-## It is worth noting that @AMDEP@ and @AMDEPBACKSLASH@ are not
-## transformed by automake, they are AC_SUBST'ed.
+## It is worth noting that @AMDEPBACKSLASH@ is not transformed by automake,
+## it is AC_SUBST'ed, and @AMDEP@ can be both deactivated by automake,
+## or by AC_SUBST.
 
 @AMDEP@@FPFX@DEPMODE = @@FPFX@DEPMODE@
 
@@ -32,14 +33,14 @@
 @AMDEP@        $(@FPFX@DEPMODE) $(depcomp) @AMDEPBACKSLASH@
        @COMPILE@ -c -o @OBJ@ `test -f @SOURCE@ || echo '$(srcdir)/'`@SOURCE@
 
-LIBTOOL@EXT@.lo:
-LIBTOOL@AMDEP@ source='@SOURCE@' object='@LTOBJ@' libtool=yes @AMDEPBACKSLASH@
-LIBTOOL@AMDEP@ depfile='$(DEPDIR)/@BASE@.Plo' tmpdepfile='$(DEPDIR)/@BASE@.TPlo' @AMDEPBACKSLASH@
-LIBTOOL@AMDEP@ $(@FPFX@DEPMODE) $(depcomp) @AMDEPBACKSLASH@
-LIBTOOL        @LTCOMPILE@ -c -o @LTOBJ@ `test -f @SOURCE@ || echo '$(srcdir)/'`@SOURCE@
-
-OBJEXT@EXT@.obj:
-OBJEXT@AMDEP@  source='@SOURCE@' object='@OBJOBJ@' libtool=no @AMDEPBACKSLASH@
-OBJEXT@AMDEP@  depfile='$(DEPDIR)/@BASE@.Po' tmpdepfile='$(DEPDIR)/@BASE@.TPo' @AMDEPBACKSLASH@
-OBJEXT@AMDEP@  $(@FPFX@DEPMODE) $(depcomp) @AMDEPBACKSLASH@
-OBJEXT @COMPILE@ -c -o @OBJOBJ@ `cygpath -w @SOURCE@`
+?LIBTOOL?@EXT@.lo:
+?LIBTOOL?@AMDEP@       source='@SOURCE@' object='@LTOBJ@' libtool=yes @AMDEPBACKSLASH@
+?LIBTOOL?@AMDEP@       depfile='$(DEPDIR)/@BASE@.Plo' tmpdepfile='$(DEPDIR)/@BASE@.TPlo' @AMDEPBACKSLASH@
+?LIBTOOL?@AMDEP@       $(@FPFX@DEPMODE) $(depcomp) @AMDEPBACKSLASH@
+?LIBTOOL?      @LTCOMPILE@ -c -o @LTOBJ@ `test -f @SOURCE@ || echo '$(srcdir)/'`@SOURCE@
+
+?OBJEXT?@EXT@.obj:
+?OBJEXT?@AMDEP@        source='@SOURCE@' object='@OBJOBJ@' libtool=no @AMDEPBACKSLASH@
+?OBJEXT?@AMDEP@        depfile='$(DEPDIR)/@BASE@.Po' tmpdepfile='$(DEPDIR)/@BASE@.TPo' @AMDEPBACKSLASH@
+?OBJEXT?@AMDEP@        $(@FPFX@DEPMODE) $(depcomp) @AMDEPBACKSLASH@
+?OBJEXT?       @COMPILE@ -c -o @OBJOBJ@ `cygpath -w @SOURCE@`

diff --git a/lib/am/distdir.am b/lib/am/distdir.am
index 85e69f318a813f3efbda75312f7e7ce93a9da07e..45be94684cdb3dd1a746002cbffe9268b561a9f4 100644 (file)
--- a/lib/am/distdir.am
+++ b/lib/am/distdir.am
@@ -23,15 +23,15 @@ distdir: $(DISTFILES)
 ## For Gnits users, this is pretty handy.  Look at 15 lines
 ## in case some explanatory text is desirable.
 ##
-@TOPDIR@@CK-NEWS@      @if sed 15q $(srcdir)/NEWS | fgrep -e "$(VERSION)" > /dev/null; then :; else \
-@TOPDIR@@CK-NEWS@        echo "NEWS not updated; not releasing" 1>&2; \
-@TOPDIR@@CK-NEWS@        exit 1; \
-@TOPDIR@@CK-NEWS@      fi
+?TOPDIR??CK-NEWS?      @if sed 15q $(srcdir)/NEWS | fgrep -e "$(VERSION)" > /dev/null; then :; else \
+?TOPDIR??CK-NEWS?        echo "NEWS not updated; not releasing" 1>&2; \
+?TOPDIR??CK-NEWS?        exit 1; \
+?TOPDIR??CK-NEWS?      fi
 ##
 ## Only for the top dir.
 ##
-@TOPDIR@       -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir)
-@TOPDIR@       mkdir $(distdir)
+?TOPDIR?       -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir)
+?TOPDIR?       mkdir $(distdir)
 ##
 ##
        $(mkinstalldirs) @DISTDIRS@
@@ -46,8 +46,8 @@ distdir: $(DISTFILES)
 ## distribute could actually be a cross-filesystem symlink -- this can
 ## easily happen if "gettextize" was run on the distribution.
 ##
-@CYGNUS@  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-@NCYGNUS@  d=$(srcdir); \
+?CYGNUS?         if test -f $$file; then d=.; else d=$(srcdir); fi; \
+?!CYGNUS?        d=$(srcdir); \
 ##
          if test -d $$d/$$file; then \
 ## Don't mention $$file in destination argument, since this fails if
@@ -70,13 +70,13 @@ distdir: $(DISTFILES)
 ## directory, then we use `distdir' instead of `top_distdir'; this lets
 ## us work correctly with an enclosing package.
 ##
-@SUBDIRS@      for subdir in $(@DIST_SUBDIR_NAME@); do \
-@SUBDIRS@        if test "$$subdir" = .; then :; else \
-@SUBDIRS@          test -d $(distdir)/$$subdir \
-@SUBDIRS@          || mkdir $(distdir)/$$subdir \
-@SUBDIRS@          || exit 1; \
-@SUBDIRS@          (cd $$subdir && \
-@SUBDIRS@            $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(@TOP_DISTDIR@) distdir=../$(distdir)/$$subdir distdir) \
-@SUBDIRS@            || exit 1; \
-@SUBDIRS@        fi; \
-@SUBDIRS@      done
+?SUBDIRS?      for subdir in $(@DIST_SUBDIR_NAME@); do \
+?SUBDIRS?        if test "$$subdir" = .; then :; else \
+?SUBDIRS?          test -d $(distdir)/$$subdir \
+?SUBDIRS?          || mkdir $(distdir)/$$subdir \
+?SUBDIRS?          || exit 1; \
+?SUBDIRS?          (cd $$subdir && \
+?SUBDIRS?            $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(@TOP_DISTDIR@) distdir=../$(distdir)/$$subdir distdir) \
+?SUBDIRS?            || exit 1; \
+?SUBDIRS?        fi; \
+?SUBDIRS?      done

diff --git a/lib/am/header.am b/lib/am/header.am
index 2eb579c55d1a0b3ec53148b6b1b2bd6b254b5a63..27636d281a9db4d352b972cdbc6e440719205107 100644 (file)
--- a/lib/am/header.am
+++ b/lib/am/header.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright 1994, 1995, 1996, 1998, 1999 Free Software Foundation, Inc.
+## Copyright 1994, 1995, 1996, 1998, 1999, 2001 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -23,8 +23,8 @@ install-@DIR@HEADERS: $(@DIR@_HEADERS)
        @list='$(@DIR@_HEADERS)'; for p in $$list; do \
 ## A header file can be in the source directory or the build directory.
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-BASE     f="`echo $$p | sed -e 's|^.*/||'`"; \
-NOBASE   f="$$p"; \
+?BASE?   f="`echo $$p | sed -e 's|^.*/||'`"; \
+?!NOBASE?        f="$$p"; \
          echo " $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(@NDIR@dir)/$$f"; \
          $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(@NDIR@dir)/$$f; \
        done
@@ -32,8 +32,8 @@ NOBASE          f="$$p"; \
 uninstall-@DIR@HEADERS:
        @$(NORMAL_UNINSTALL)
        @list='$(@DIR@_HEADERS)'; for p in $$list; do \
-BASE     f="`echo $$p | sed -e 's|^.*/||'`"; \
-NOBASE   f="$$p"; \
+?BASE?   f="`echo $$p | sed -e 's|^.*/||'`"; \
+?!BASE?          f="$$p"; \
          echo " rm -f $(DESTDIR)$(@NDIR@dir)/$$f"; \
          rm -f $(DESTDIR)$(@NDIR@dir)/$$f; \
        done

diff --git a/lib/am/lisp.am b/lib/am/lisp.am
index 82dc7a408602d224d320b85be29cfa0d63ea9287..c80abc0acd09dc89a261f60f3dc4a51c021aa550 100644 (file)
--- a/lib/am/lisp.am
+++ b/lib/am/lisp.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright 1996, 1998, 1999, 2000 Free Software Foundation, Inc.
+## Copyright 1996, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -23,8 +23,8 @@ install-@DIR@LISP: $(@DIR@_LISP) $(ELCFILES)
        @list='$(@DIR@_LISP)'; for p in $$list; do \
 ## A lisp file can be in the source directory or the build directory.
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-BASE     f="`echo $$p | sed -e 's|^.*/||'`"; \
-NOBASE   f="$$p"; \
+?BASE?   f="`echo $$p | sed -e 's|^.*/||'`"; \
+?!BASE?          f="$$p"; \
          echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@NDIR@dir)/$$f"; \
          $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@NDIR@dir)/$$f; \
 ## Only install .elc file if it exists.
@@ -37,8 +37,8 @@ NOBASE          f="$$p"; \
 uninstall-@DIR@LISP:
        @$(NORMAL_UNINSTALL)
        @list='$(@DIR@_LISP)'; for p in $$list; do \
-BASE     f="`echo $$p | sed -e 's|^.*/||'`"; \
-NOBASE   f="$$p"; \
+?BASE?   f="`echo $$p | sed -e 's|^.*/||'`"; \
+?!BASE?          f="$$p"; \
          echo " rm -f $(@NDIR@dir)/$$f $(DESTDIR)$(@NDIR@dir)/$${f}c"; \
          rm -f $(DESTDIR)$(@NDIR@dir)/$$f $(DESTDIR)$(@NDIR@dir)/$${f}c; \
        done

diff --git a/lib/am/tags.am b/lib/am/tags.am
index 80680f1c9fbdca24ffa35306549d091857628507..da02237ca274f7129ef6392813db3a741f6ff14b 100644 (file)
--- a/lib/am/tags.am
+++ b/lib/am/tags.am
@@ -33,12 +33,12 @@ TAGS: @DIRS@ $(HEADERS) $(SOURCES) @CONFIG@ $(TAGS_DEPENDENCIES) \
                $(TAGS_FILES) $(LISP)
        tags=; \
        here=`pwd`; \
-SUBDIRS        list='$(SUBDIRS)'; for subdir in $$list; do \
+?SUBDIRS?      list='$(SUBDIRS)'; for subdir in $$list; do \
 ## Do nothing if we're trying to look in `.'.
-SUBDIRS   if test "$$subdir" = .; then :; else \
-SUBDIRS            test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-SUBDIRS   fi; \
-SUBDIRS        done; \
+?SUBDIRS?   if test "$$subdir" = .; then :; else \
+?SUBDIRS?          test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+?SUBDIRS?   fi; \
+?SUBDIRS?      done; \
 ## Make sure the list of sources is unique.
        list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
        unique=`for i in $$list; do \

diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index 013fb301928ac260b45d256b5bdf97226dd0e1fc..6db30f5f156c53d8997be58b4f9faba87d0d5974 100644 (file)
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -29,11 +29,11 @@
 ## makeinfo.  Otherwise, if the texinfo file shrinks (or if you start
 ## using --no-split), you'll be left with some dead info files lying
 ## around -- dead files which will end up in the distribution.
-NOTCYGNUS      @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
-NOTCYGNUS      cd $(srcdir) \
-NOTCYGNUS        && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
-CYGNUS @rm -f $@ $@-[0-9] $@-[0-9][0-9]
-CYGNUS $(MAKEINFO) -I $(srcdir) $<
+?!CYGNUS?      @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
+?!CYGNUS?      cd $(srcdir) \
+?!CYGNUS?        && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+?CYGNUS?       @rm -f $@ $@-[0-9] $@-[0-9][0-9]
+?CYGNUS?       $(MAKEINFO) -I $(srcdir) $<
 
 .texi.dvi:
        TEXINPUTS=@TEXINFODIR@:$$TEXINPUTS \
@@ -50,11 +50,11 @@ CYGNUS      $(MAKEINFO) -I $(srcdir) $<
 ## makeinfo.  Otherwise, if the texinfo file shrinks (or if you start
 ## using --no-split), you'll be left with some dead info files lying
 ## around -- dead files which will end up in the distribution.
-NOTCYGNUS      @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
-NOTCYGNUS      cd $(srcdir) \
-NOTCYGNUS        && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
-CYGNUS @rm -f $@ $@-[0-9] $@-[0-9][0-9]
-CYGNUS $(MAKEINFO) -I $(srcdir) $<
+?!CYGNUS?      @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
+?!CYGNUS?      cd $(srcdir) \
+?!CYGNUS?        && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+?CYGNUS?       @rm -f $@ $@-[0-9] $@-[0-9][0-9]
+?CYGNUS?       $(MAKEINFO) -I $(srcdir) $<
 
 .texinfo.info:
 ## We want to force the .info file to be built in srcdir.  This is
@@ -65,11 +65,11 @@ CYGNUS      $(MAKEINFO) -I $(srcdir) $<
 ## makeinfo.  Otherwise, if the texinfo file shrinks (or if you start
 ## using --no-split), you'll be left with some dead info files lying
 ## around -- dead files which will end up in the distribution.
-NOTCYGNUS      @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
-NOTCYGNUS      cd $(srcdir) \
-NOTCYGNUS        && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
-CYGNUS @rm -f $@ $@-[0-9] $@-[0-9][0-9]
-CYGNUS $(MAKEINFO) -I $(srcdir) $<
+?!CYGNUS?      @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
+?!CYGNUS?      cd $(srcdir) \
+?!CYGNUS?        && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+?CYGNUS?       @rm -f $@ $@-[0-9] $@-[0-9][0-9]
+?CYGNUS?       $(MAKEINFO) -I $(srcdir) $<
 
 .texinfo:
 ## We want to force the .info file to be built in srcdir.  This is
@@ -80,11 +80,11 @@ CYGNUS      $(MAKEINFO) -I $(srcdir) $<
 ## makeinfo.  Otherwise, if the texinfo file shrinks (or if you start
 ## using --no-split), you'll be left with some dead info files lying
 ## around -- dead files which will end up in the distribution.
-NOTCYGNUS      @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
-NOTCYGNUS      cd $(srcdir) \
-NOTCYGNUS        && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
-CYGNUS @rm -f $@ $@-[0-9] $@-[0-9][0-9]
-CYGNUS $(MAKEINFO) -I $(srcdir) $<
+?!CYGNUS?      @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
+?!CYGNUS?      cd $(srcdir) \
+?!CYGNUS?        && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+?CYGNUS?       @rm -f $@ $@-[0-9] $@-[0-9][0-9]
+?CYGNUS?       $(MAKEINFO) -I $(srcdir) $<
 
 .texinfo.dvi:
        TEXINPUTS=@TEXINFODIR@:$$TEXINPUTS \
@@ -101,11 +101,11 @@ CYGNUS    $(MAKEINFO) -I $(srcdir) $<
 ## makeinfo.  Otherwise, if the texinfo file shrinks (or if you start
 ## using --no-split), you'll be left with some dead info files lying
 ## around -- dead files which will end up in the distribution.
-NOTCYGNUS      @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
-NOTCYGNUS      cd $(srcdir) \
-NOTCYGNUS        && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
-CYGNUS @rm -f $@ $@-[0-9] $@-[0-9][0-9]
-CYGNUS $(MAKEINFO) -I $(srcdir) $<
+?!CYGNUS?      @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
+?!CYGNUS?      cd $(srcdir) \
+?!CYGNUS?        && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+?CYGNUS?       @rm -f $@ $@-[0-9] $@-[0-9][0-9]
+?CYGNUS?       $(MAKEINFO) -I $(srcdir) $<
 
 .txi.dvi:
        TEXINPUTS=@TEXINFODIR@:$$TEXINPUTS \
@@ -122,11 +122,11 @@ CYGNUS    $(MAKEINFO) -I $(srcdir) $<
 ## makeinfo.  Otherwise, if the texinfo file shrinks (or if you start
 ## using --no-split), you'll be left with some dead info files lying
 ## around -- dead files which will end up in the distribution.
-NOTCYGNUS      @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
-NOTCYGNUS      cd $(srcdir) \
-NOTCYGNUS        && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
-CYGNUS @rm -f $@ $@-[0-9] $@-[0-9][0-9]
-CYGNUS $(MAKEINFO) -I $(srcdir) $<
+?!CYGNUS?      @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
+?!CYGNUS?      cd $(srcdir) \
+?!CYGNUS?        && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+?CYGNUS?       @rm -f $@ $@-[0-9] $@-[0-9][0-9]
+?CYGNUS?       $(MAKEINFO) -I $(srcdir) $<
 
 ## The way to make PostScript, for those who want it.
 DVIPS = dvips
@@ -143,8 +143,8 @@ install-info-am: $(INFO_DEPS)
        $(mkinstalldirs) $(DESTDIR)$(infodir)
        @list='$(INFO_DEPS)'; \
        for file in $$list; do \
-CYGNUS   if test -f $$file; then d=.; else d=$(srcdir); fi; \
-NOTCYGNUS        d=$(srcdir); \
+?CYGNUS?         if test -f $$file; then d=.; else d=$(srcdir); fi; \
+?!CYGNUS?        d=$(srcdir); \
 ## We use these strange circumlocutions because we want the "ifile" to
 ## be relative, for the install.
          for ifile in `CDPATH=: && cd $$d && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
@@ -200,8 +200,8 @@ dist-info: $(INFO_DEPS)
        for base in $$list; do \
 ## In Cygnus mode, allow info file to be in source or build dir.  In
 ## other modes, allow only source dir.
-NOTCYGNUS        d=$(srcdir); \
-CYGNUS   if test -f $$base; then d=.; else d=$(srcdir); fi; \
+?!CYGNUS?        d=$(srcdir); \
+?CYGNUS?         if test -f $$base; then d=.; else d=$(srcdir); fi; \
          for file in `CDPATH=: && cd $$d && eval echo $$base*`; do \
            test -f $(distdir)/$$file \
            || cp -p $$d/$$file $(distdir)/$$file; \
@@ -223,7 +223,7 @@ mostlyclean-aminfo:
 maintainer-clean-am: maintainer-clean-aminfo
 maintainer-clean-aminfo:
 ## Eww.  But how else can we find all the output files from makeinfo?
-NOTCYGNUS      cd $(srcdir) && \
+?!CYGNUS?      cd $(srcdir) && \
        for i in $(INFO_DEPS); do \
          rm -f $$i; \
          if test "`echo $$i-[0-9]*`" != "$$i-[0-9]*"; then \
@@ -231,5 +231,5 @@ NOTCYGNUS   cd $(srcdir) && \
          fi; \
        done
 
-CYGNUS.PHONY: clean-info
-CYGNUSclean-info: mostlyclean-aminfo
+?CYGNUS?.PHONY: clean-info
+?CYGNUS?clean-info: mostlyclean-aminfo

diff --git a/lisp.am b/lisp.am
index 82dc7a408602d224d320b85be29cfa0d63ea9287..c80abc0acd09dc89a261f60f3dc4a51c021aa550 100644 (file)
--- a/lisp.am
+++ b/lisp.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright 1996, 1998, 1999, 2000 Free Software Foundation, Inc.
+## Copyright 1996, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -23,8 +23,8 @@ install-@DIR@LISP: $(@DIR@_LISP) $(ELCFILES)
        @list='$(@DIR@_LISP)'; for p in $$list; do \
 ## A lisp file can be in the source directory or the build directory.
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-BASE     f="`echo $$p | sed -e 's|^.*/||'`"; \
-NOBASE   f="$$p"; \
+?BASE?   f="`echo $$p | sed -e 's|^.*/||'`"; \
+?!BASE?          f="$$p"; \
          echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@NDIR@dir)/$$f"; \
          $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@NDIR@dir)/$$f; \
 ## Only install .elc file if it exists.
@@ -37,8 +37,8 @@ NOBASE          f="$$p"; \
 uninstall-@DIR@LISP:
        @$(NORMAL_UNINSTALL)
        @list='$(@DIR@_LISP)'; for p in $$list; do \
-BASE     f="`echo $$p | sed -e 's|^.*/||'`"; \
-NOBASE   f="$$p"; \
+?BASE?   f="`echo $$p | sed -e 's|^.*/||'`"; \
+?!BASE?          f="$$p"; \
          echo " rm -f $(@NDIR@dir)/$$f $(DESTDIR)$(@NDIR@dir)/$${f}c"; \
          rm -f $(DESTDIR)$(@NDIR@dir)/$$f $(DESTDIR)$(@NDIR@dir)/$${f}c; \
        done

diff --git a/m4/Makefile.in b/m4/Makefile.in
index 55d1c311c927540c5234b839c9c05e7f74cead5b..332fac7090c5eeb89f290768e9c4d97cd474bf78 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -1,6 +1,6 @@
 # Makefile.in generated automatically by automake 1.4c from Makefile.am
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -107,7 +107,7 @@ install-m4dataDATA: $(m4data_DATA)
        @$(NORMAL_INSTALL)
        $(mkinstalldirs) $(DESTDIR)$(m4datadir)
        @list='$(m4data_DATA)'; for p in $$list; do \
-         if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
          f="`echo $$p | sed -e 's|^.*/||'`"; \
          echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(m4datadir)/$$f"; \
          $(INSTALL_DATA) $$d$$p $(DESTDIR)$(m4datadir)/$$f; \
@@ -168,10 +168,8 @@ installdirs:
 
 mostlyclean-generic:
 
-
 clean-generic:
 
-
 distclean-generic:
        -rm -f Makefile $(CONFIG_CLEAN_FILES)
        -rm -f config.cache config.log stamp-h stamp-h[0-9]*
@@ -208,4 +206,3 @@ mostlyclean-am: mostlyclean-generic
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
-

diff --git a/tags.am b/tags.am
index 80680f1c9fbdca24ffa35306549d091857628507..da02237ca274f7129ef6392813db3a741f6ff14b 100644 (file)
--- a/tags.am
+++ b/tags.am
@@ -33,12 +33,12 @@ TAGS: @DIRS@ $(HEADERS) $(SOURCES) @CONFIG@ $(TAGS_DEPENDENCIES) \
                $(TAGS_FILES) $(LISP)
        tags=; \
        here=`pwd`; \
-SUBDIRS        list='$(SUBDIRS)'; for subdir in $$list; do \
+?SUBDIRS?      list='$(SUBDIRS)'; for subdir in $$list; do \
 ## Do nothing if we're trying to look in `.'.
-SUBDIRS   if test "$$subdir" = .; then :; else \
-SUBDIRS            test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-SUBDIRS   fi; \
-SUBDIRS        done; \
+?SUBDIRS?   if test "$$subdir" = .; then :; else \
+?SUBDIRS?          test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+?SUBDIRS?   fi; \
+?SUBDIRS?      done; \
 ## Make sure the list of sources is unique.
        list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
        unique=`for i in $$list; do \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 188782e8a8ead15a0580c49c6a0e67529340633c..352f2713b6ffed01202cde3f7c80aef7b38aa14f 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,6 +1,6 @@
 # Makefile.in generated automatically by automake 1.4c from Makefile.am
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -465,10 +465,8 @@ installdirs:
 
 mostlyclean-generic:
 
-
 clean-generic:
 
-
 distclean-generic:
        -rm -f Makefile $(CONFIG_CLEAN_FILES)
        -rm -f config.cache config.log stamp-h stamp-h[0-9]*
@@ -508,4 +506,3 @@ distclean-local:
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
-

diff --git a/texinfos.am b/texinfos.am
index 013fb301928ac260b45d256b5bdf97226dd0e1fc..6db30f5f156c53d8997be58b4f9faba87d0d5974 100644 (file)
--- a/texinfos.am
+++ b/texinfos.am
@@ -29,11 +29,11 @@
 ## makeinfo.  Otherwise, if the texinfo file shrinks (or if you start
 ## using --no-split), you'll be left with some dead info files lying
 ## around -- dead files which will end up in the distribution.
-NOTCYGNUS      @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
-NOTCYGNUS      cd $(srcdir) \
-NOTCYGNUS        && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
-CYGNUS @rm -f $@ $@-[0-9] $@-[0-9][0-9]
-CYGNUS $(MAKEINFO) -I $(srcdir) $<
+?!CYGNUS?      @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
+?!CYGNUS?      cd $(srcdir) \
+?!CYGNUS?        && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+?CYGNUS?       @rm -f $@ $@-[0-9] $@-[0-9][0-9]
+?CYGNUS?       $(MAKEINFO) -I $(srcdir) $<
 
 .texi.dvi:
        TEXINPUTS=@TEXINFODIR@:$$TEXINPUTS \
@@ -50,11 +50,11 @@ CYGNUS      $(MAKEINFO) -I $(srcdir) $<
 ## makeinfo.  Otherwise, if the texinfo file shrinks (or if you start
 ## using --no-split), you'll be left with some dead info files lying
 ## around -- dead files which will end up in the distribution.
-NOTCYGNUS      @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
-NOTCYGNUS      cd $(srcdir) \
-NOTCYGNUS        && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
-CYGNUS @rm -f $@ $@-[0-9] $@-[0-9][0-9]
-CYGNUS $(MAKEINFO) -I $(srcdir) $<
+?!CYGNUS?      @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
+?!CYGNUS?      cd $(srcdir) \
+?!CYGNUS?        && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+?CYGNUS?       @rm -f $@ $@-[0-9] $@-[0-9][0-9]
+?CYGNUS?       $(MAKEINFO) -I $(srcdir) $<
 
 .texinfo.info:
 ## We want to force the .info file to be built in srcdir.  This is
@@ -65,11 +65,11 @@ CYGNUS      $(MAKEINFO) -I $(srcdir) $<
 ## makeinfo.  Otherwise, if the texinfo file shrinks (or if you start
 ## using --no-split), you'll be left with some dead info files lying
 ## around -- dead files which will end up in the distribution.
-NOTCYGNUS      @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
-NOTCYGNUS      cd $(srcdir) \
-NOTCYGNUS        && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
-CYGNUS @rm -f $@ $@-[0-9] $@-[0-9][0-9]
-CYGNUS $(MAKEINFO) -I $(srcdir) $<
+?!CYGNUS?      @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
+?!CYGNUS?      cd $(srcdir) \
+?!CYGNUS?        && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+?CYGNUS?       @rm -f $@ $@-[0-9] $@-[0-9][0-9]
+?CYGNUS?       $(MAKEINFO) -I $(srcdir) $<
 
 .texinfo:
 ## We want to force the .info file to be built in srcdir.  This is
@@ -80,11 +80,11 @@ CYGNUS      $(MAKEINFO) -I $(srcdir) $<
 ## makeinfo.  Otherwise, if the texinfo file shrinks (or if you start
 ## using --no-split), you'll be left with some dead info files lying
 ## around -- dead files which will end up in the distribution.
-NOTCYGNUS      @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
-NOTCYGNUS      cd $(srcdir) \
-NOTCYGNUS        && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
-CYGNUS @rm -f $@ $@-[0-9] $@-[0-9][0-9]
-CYGNUS $(MAKEINFO) -I $(srcdir) $<
+?!CYGNUS?      @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
+?!CYGNUS?      cd $(srcdir) \
+?!CYGNUS?        && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+?CYGNUS?       @rm -f $@ $@-[0-9] $@-[0-9][0-9]
+?CYGNUS?       $(MAKEINFO) -I $(srcdir) $<
 
 .texinfo.dvi:
        TEXINPUTS=@TEXINFODIR@:$$TEXINPUTS \
@@ -101,11 +101,11 @@ CYGNUS    $(MAKEINFO) -I $(srcdir) $<
 ## makeinfo.  Otherwise, if the texinfo file shrinks (or if you start
 ## using --no-split), you'll be left with some dead info files lying
 ## around -- dead files which will end up in the distribution.
-NOTCYGNUS      @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
-NOTCYGNUS      cd $(srcdir) \
-NOTCYGNUS        && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
-CYGNUS @rm -f $@ $@-[0-9] $@-[0-9][0-9]
-CYGNUS $(MAKEINFO) -I $(srcdir) $<
+?!CYGNUS?      @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
+?!CYGNUS?      cd $(srcdir) \
+?!CYGNUS?        && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+?CYGNUS?       @rm -f $@ $@-[0-9] $@-[0-9][0-9]
+?CYGNUS?       $(MAKEINFO) -I $(srcdir) $<
 
 .txi.dvi:
        TEXINPUTS=@TEXINFODIR@:$$TEXINPUTS \
@@ -122,11 +122,11 @@ CYGNUS    $(MAKEINFO) -I $(srcdir) $<
 ## makeinfo.  Otherwise, if the texinfo file shrinks (or if you start
 ## using --no-split), you'll be left with some dead info files lying
 ## around -- dead files which will end up in the distribution.
-NOTCYGNUS      @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
-NOTCYGNUS      cd $(srcdir) \
-NOTCYGNUS        && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
-CYGNUS @rm -f $@ $@-[0-9] $@-[0-9][0-9]
-CYGNUS $(MAKEINFO) -I $(srcdir) $<
+?!CYGNUS?      @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
+?!CYGNUS?      cd $(srcdir) \
+?!CYGNUS?        && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+?CYGNUS?       @rm -f $@ $@-[0-9] $@-[0-9][0-9]
+?CYGNUS?       $(MAKEINFO) -I $(srcdir) $<
 
 ## The way to make PostScript, for those who want it.
 DVIPS = dvips
@@ -143,8 +143,8 @@ install-info-am: $(INFO_DEPS)
        $(mkinstalldirs) $(DESTDIR)$(infodir)
        @list='$(INFO_DEPS)'; \
        for file in $$list; do \
-CYGNUS   if test -f $$file; then d=.; else d=$(srcdir); fi; \
-NOTCYGNUS        d=$(srcdir); \
+?CYGNUS?         if test -f $$file; then d=.; else d=$(srcdir); fi; \
+?!CYGNUS?        d=$(srcdir); \
 ## We use these strange circumlocutions because we want the "ifile" to
 ## be relative, for the install.
          for ifile in `CDPATH=: && cd $$d && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
@@ -200,8 +200,8 @@ dist-info: $(INFO_DEPS)
        for base in $$list; do \
 ## In Cygnus mode, allow info file to be in source or build dir.  In
 ## other modes, allow only source dir.
-NOTCYGNUS        d=$(srcdir); \
-CYGNUS   if test -f $$base; then d=.; else d=$(srcdir); fi; \
+?!CYGNUS?        d=$(srcdir); \
+?CYGNUS?         if test -f $$base; then d=.; else d=$(srcdir); fi; \
          for file in `CDPATH=: && cd $$d && eval echo $$base*`; do \
            test -f $(distdir)/$$file \
            || cp -p $$d/$$file $(distdir)/$$file; \
@@ -223,7 +223,7 @@ mostlyclean-aminfo:
 maintainer-clean-am: maintainer-clean-aminfo
 maintainer-clean-aminfo:
 ## Eww.  But how else can we find all the output files from makeinfo?
-NOTCYGNUS      cd $(srcdir) && \
+?!CYGNUS?      cd $(srcdir) && \
        for i in $(INFO_DEPS); do \
          rm -f $$i; \
          if test "`echo $$i-[0-9]*`" != "$$i-[0-9]*"; then \
@@ -231,5 +231,5 @@ NOTCYGNUS   cd $(srcdir) && \
          fi; \
        done
 
-CYGNUS.PHONY: clean-info
-CYGNUSclean-info: mostlyclean-aminfo
+?CYGNUS?.PHONY: clean-info
+?CYGNUS?clean-info: mostlyclean-aminfo