Initial draft of --cygnus mode.

Bug fixes for config.h in subdir

19 files changed, 237 insertions, 112 deletions

diff --git a/ChangeLog b/ChangeLog
index 748e3423e..67fda0923 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,59 @@
+Thu Nov  7 14:49:16 1996  Tom Tromey  <tromey@cygnus.com>
+
+	* remake.am ($(srcdir)/Makefile.in): Pass @ARGS@ to automake.
+	* remake-subd.am ($(srcdir)/Makefile.in): Pass @ARGS@ to
+	automake.
+	* automake.in (handle_configure): Pass --cygnus when running
+	automake again.
+
+	* remake-hdr.am ($(srcdir)/stamp-h.in): Depend on @FILES@, not
+	ACCONFIG, CONFIG_TOP, CONFIG_BOT.
+	* automake.in (handle_aclocal_m4): Always find aclocal.m4 in
+	top_srcdir.
+	(handle_configure): Don't define ACCONFIG, CONFIG_TOP, CONFIG_BOT;
+	instead substitute files directly.
+
+Wed Nov  6 10:22:26 1996  Tom Tromey  <tromey@cygnus.com>
+
+	* remake-hdr.am (stamp-h): Look in top_builddir for
+	config.status.
+	($(srcdir)/stamp-h.in): Look in top_srcdir for configure.in.
+
+Thu Oct 31 10:55:59 1996  Tom Tromey  <tromey@cygnus.com>
+
+	* texinfos.am (.texi.dvi): Set MAKEINFO when running texi2dvi.
+	From Jim Meyering.
+
+	* automake.in (handle_texinfo): Push install-info-am, not
+	install-info.
+	(handle_merge_targets): Handle no-installinfo option.
+
+	* texinfos.am (install-info-am): Renamed from install-info.
+
+	* automake.in (handle_subdirs): Include install-info-recursive if
+	no-installinfo given.
+
+	* subdirs.am: Include INSTALLINFO token.
+
+	* automake.in (handle_texinfo): Explicitly define MAKEINFO,
+	TEXI2DVI.
+	(cygnus_mode): New global.
+	(handle_dist_worker): Pass --cygnus to automake.
+	(initialize_global_constants): Document --cygnus.
+	(check_cygnus): New sub.
+	(handle_texinfo): Don't require texinfo.tex in Cygnus mode.
+
+	* texi-vars.am: Removed.
+
+	* dejagnu.am (check-DEJAGNU): Don't define rootme.
+
+	* automake.in (handle_tests): Define EXPECT, RUNTEST.
+
+	* dejagnu.am (EXPECT): Removed.
+	(RUNTEST): Removed.
+
+	* automake.in (define_program_variable): New sub.
+
 Mon Oct 28 10:43:48 1996  Tom Tromey  <tromey@cygnus.com>
 
 	* automake.in (handle_dependencies): Use -M, not -MM, for C++
diff --git a/Makefile.am b/Makefile.am
index a689a2651..53cc173f2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,7 +14,7 @@ compile.am data.am dejagnu.am depend.am depend2.am dist-vars.am footer.am \
 header.am header-vars.am kr-extra.am libs.am library.am \
 mans-vars.am program.am progs.am remake-hdr.am remake-subd.am \
 remake.am scripts.am subdirs.am tags.am tags-subd.am tags-clean.am \
-texi-vers.am texi-vars.am texinfos.am libs-clean.am \
+texi-vers.am texinfos.am libs-clean.am \
 progs-clean.am data-clean.am COPYING INSTALL texinfo.tex ansi2knr.c \
 ansi2knr.1 aclocal.m4 lisp.am lisp-clean.am
 
diff --git a/Makefile.in b/Makefile.in
index 043db4d95..d691e94ec 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -52,7 +52,7 @@ compile.am data.am dejagnu.am depend.am depend2.am dist-vars.am footer.am \
 header.am header-vars.am kr-extra.am libs.am library.am \
 mans-vars.am program.am progs.am remake-hdr.am remake-subd.am \
 remake.am scripts.am subdirs.am tags.am tags-subd.am tags-clean.am \
-texi-vers.am texi-vars.am texinfos.am libs-clean.am \
+texi-vers.am texinfos.am libs-clean.am \
 progs-clean.am data-clean.am COPYING INSTALL texinfo.tex ansi2knr.c \
 ansi2knr.1 aclocal.m4 lisp.am lisp-clean.am
 
@@ -65,12 +65,11 @@ EXTRA_DIST = acinstall $(pkgdata_DATA)
 ETAGS_ARGS = automake.in aclocal.in --lang=none \
  --regex='/^@node[ \t]+\([^,]+\)/\1/' automake.texi
 TAGS_DEPENDENCIES = automake.in aclocal.in automake.texi
-ACLOCAL = aclocal.m4
+ACLOCAL = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES =  automake aclocal
 SCRIPTS =  $(bin_SCRIPTS) $(pkgdata_SCRIPTS)
 
-
 MAKEINFO = makeinfo
 TEXI2DVI = texi2dvi
 INFOS = automake.info automake.info[-0-9]*
@@ -101,14 +100,14 @@ aclocal.m4: configure.in
 	cd $(srcdir) && aclocal
 
 $(srcdir)/Makefile.in: Makefile.am configure.in
-	cd $(srcdir) && automake --strictness=gnits Makefile
+	cd $(srcdir) && automake --strictness=@STRICTNESS@ Makefile
 
 # For an explanation of the following Makefile rules, see node
 # `Automatic Remaking' in GNU Autoconf documentation.
 Makefile: $(srcdir)/Makefile.in config.status $(BUILT_SOURCES)
-	CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
+	CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 config.status: configure
-	./config.status --recheck
+	$(SHELL) ./config.status --recheck
 $(srcdir)/configure: configure.in $(ACLOCAL) $(CONFIGURE_DEPENDENCIES)
 	cd $(srcdir) && autoconf
 automake: $(top_builddir)/config.status automake.in
@@ -180,7 +179,8 @@ automake.dvi: automake.texi version.texi
 	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
 
 .texi.dvi:
-	TEXINPUTS=$(srcdir):$$TEXINPUTS $(TEXI2DVI) $<
+	TEXINPUTS=$(srcdir):$$TEXINPUTS \
+	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
 
 .texinfo.info:
 	cd $(srcdir) \
@@ -189,7 +189,7 @@ automake.dvi: automake.texi version.texi
 .texinfo.dvi:
 	TEXINPUTS=$(srcdir):$$TEXINPUTS $(TEXI2DVI) $<
 
-install-info: $(INFO_DEPS)
+install-info-am: $(INFO_DEPS)
 	$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(infodir)
 	for file in $(INFO_DEPS); do \
@@ -253,7 +253,7 @@ uninstall-pkgdataDATA:
 @SET_MAKE@
 
 all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive \
+installdirs-recursive install-recursive uninstall-recursive  \
 check-recursive installcheck-recursive info-recursive dvi-recursive \
 mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
@@ -352,7 +352,7 @@ all-am: $(INFO_DEPS) $(SCRIPTS) $(DATA) Makefile
 
 install-exec-am: install-binSCRIPTS
 
-install-data-am: install-info install-pkgdataSCRIPTS install-pkgdataDATA
+install-data-am: install-info-am install-pkgdataSCRIPTS install-pkgdataDATA
 
 uninstall-am: uninstall-binSCRIPTS uninstall-pkgdataSCRIPTS uninstall-info uninstall-pkgdataDATA
 
@@ -415,7 +415,7 @@ maintainer-clean:  maintainer-clean-am maintainer-clean-recursive
 
 .PHONY: default uninstall-binSCRIPTS install-binSCRIPTS \
 uninstall-pkgdataSCRIPTS install-pkgdataSCRIPTS mostlyclean-vti \
-distclean-vti clean-vti maintainer-clean-vti install-info \
+distclean-vti clean-vti maintainer-clean-vti install-info-am \
 uninstall-info mostlyclean-info distclean-info clean-info \
 maintainer-clean-info uninstall-pkgdataDATA install-pkgdataDATA \
 install-data-recursive uninstall-data-recursive install-exec-recursive \
diff --git a/TODO b/TODO
index a7f0ede27..bdee98724 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,4 @@
 Priorities for release:
-!! MUST finish new deansification scheme...
 !! documentation (eg new macros)
 * `acinstall'
 * echo in installs?
@@ -21,12 +20,12 @@ Priorities for release:
   requests for pkg-dirs with version included
 
 Further:
-- texinfo/info changes
-- Per's suggestion
 - man page fixes
 - consider adding "echo"s to installs again.
   users can use make SHELL='sh -x' to get the full dirt
 
+* must move CONFIG_HEADER from tags.am... allow it to work in subdir.
+
 Avoid loops when installing; instead unroll them in automake
 
 Franc,ois> * ansi2knr was uselessly compiled, and it might be an
@@ -41,8 +40,6 @@ Some long-term projects:
 consider putting all check-* targets onto @check?
 To support --help/--version checking?
 
-must move CONFIG_HEADER from tags.am... allow it to work in subdir.
-
 take diff-n-query code from libit
 
 must at least partially rewrite dist system (to handle distributing
@@ -65,6 +62,7 @@ Per> .class files from a list of .java source files.
 
 From Jason Molenda:
 * allow a way to use "gzip --best"
+   [ Try  GZIP=--best make dist ]
 * don't assume GNU tar is "tar" (eg in distcheck)
 
 * actually use acinstall program
@@ -151,12 +149,7 @@ Then user must use "make -k check".  This is probably more natural.
 Consider: "cvs" option adds some cvs-specific rules?
 
 "Cygnus"-specific features:
-* Should look for certain tools in the build tree:
-  expect, dejagnu, makeinfo
-* `no-installinfo' is the default
-* always generate `info' and `install-info' targets
-* Allow `texinfo.tex' to be missing
-* don't force info files into srcdir
+* don't force info files into srcdir; ditto lex/yacc output
 
 Automake: devo/inet/Makefile.am has "all-local".  "install" depends on
 "all", but the local installs get run before the stuff in "all".  Gross.
@@ -166,6 +159,8 @@ overridable by user code.  This should probably be possible, even
 though it isn't very important.  This could be done by generating all
 internal rules via a function call instead of just appending to
 $output_rules.
+ [ this will be harder to implement when scanning a rule like all-recursive
+   from subdirs.am ]
 
 * Should be a way to have "nobuild_PROGRAMS" which aren't even built,
   but which could be by running the magic make command.
@@ -325,6 +320,11 @@ containing application.
 
 Document:
 
+write example of using automake with dejagnu
+follow calc example in dejagnu docs
+
+document gdb's yacc hack for including multiple parsers
+
 document which variables are actually scanned and which are not.
 
 finish yacc, lex
diff --git a/automake.in b/automake.in
index cc12d04e7..1c38f6f83 100755
--- a/automake.in
+++ b/automake.in
@@ -204,6 +204,9 @@ $dist_charset = 'utf8';		# recode doesn't support this yet.
 $am_file_name = '';
 $in_file_name = '';
 
+# TRUE if --cygnus seen.
+$cygnus_mode = 0;
+
 
 
 &initialize_global_constants;
@@ -312,6 +315,10 @@ sub parse_arguments
 	{
 	    &set_strictness ('gnits');
 	}
+	elsif ($arglist[0] eq '--cygnus')
+	{
+	    $cygnus_mode = 1;
+	}
 	elsif ($arglist[0] eq '--foreign')
 	{
 	    &set_strictness ('foreign');
@@ -431,6 +438,7 @@ sub generate_makefile
     }
 
     # Check first, because we might modify some state.
+    &check_cygnus;
     &check_gnu_standards;
     &check_gnits_standards;
 
@@ -1465,10 +1473,14 @@ sub handle_texinfo
 	}
     }
 
-    # Some boilerplate.
-    $output_vars .= &file_contents ('texi-vars');
+    # Find these programs wherever they may lie.  Yes, this has
+    # intimate knowledge of the structure of the texinfo distribution.
+    &define_program_variable ('MAKEINFO', 'build', 'texinfo/makeinfo',
+			      'makeinfo');
+    &define_program_variable ('TEXI2DVI', 'src', 'texinfo/util',
+			      'texi2dvi');
     $output_rules .= &file_contents ('texinfos');
-    push (@phony, 'install-info', 'uninstall-info');
+    push (@phony, 'install-info-am', 'uninstall-info');
 
     # How to clean.
     $output_rules .= "\nmostlyclean-info:\n";
@@ -1484,7 +1496,7 @@ sub handle_texinfo
     {
 	push (@uninstall, 'uninstall-info');
 	push (@installdirs, '$(infodir)');
-	unshift (@install_data, 'install-info');
+	unshift (@install_data, 'install-info-am');
 
 	# Make sure documentation is made and installed first.  Use
 	# $(INFO_DEPS), not 'info', because otherwise recursive makes
@@ -1503,8 +1515,11 @@ sub handle_texinfo
     # probably better, in case noinst_TEXINFOS is ever supported.
     &define_variable ("TEXINFOS", $contents{'info_TEXINFOS'});
 
-    # Do some error checking.
-    &require_file_with_line ('info_TEXINFOS', $FOREIGN, 'texinfo.tex');
+    # Do some error checking.  Note that this file is not required
+    # when in Cygnus mode -- a bletcherous hack.
+    &require_file_with_line ('info_TEXINFOS',
+			     $cygnus_mode ? $GNU : $FOREIGN,
+			     'texinfo.tex');
 }
 
 # Handle any man pages.
@@ -1672,7 +1687,9 @@ sub handle_dist_worker
 	  && cd $(srcdir) \\
 	  && automake --include-deps --build-dir=$$here --srcdir-name=$(srcdir) --output-dir=$$distdir --strictness='
 		 # Set strictness of output.
-		 . $strictness_name . "\n"
+		 . $strictness_name
+		 . ($cygnus_mode ? ' --cygnus' : '')
+		 . "\n"
 		 );
 	}
     }
@@ -2056,7 +2073,12 @@ sub handle_subdirs
 	    if ! -d $relative_dir . '/' . $dir;
     }
 
-    $output_rules .= &file_contents ('subdirs');
+    local ($xform) = ('s/\@INSTALLINFO\@/' .
+		      (defined $options{'no-installinfo'}
+		       ? 'install-info-recursive'
+		       : '')
+		      . '/;');
+    $output_rules .= &file_contents_with_transform ($xform, 'subdirs');
 
     # Push a bunch of phony targets.
     local ($phonies);
@@ -2085,7 +2107,7 @@ sub handle_aclocal_m4
     local ($regen_aclocal) = 0;
     if (-f 'aclocal.m4')
     {
-	&define_variable ("ACLOCAL", "aclocal.m4");
+	&define_variable ("ACLOCAL", '$(top_srcdir)/aclocal.m4');
 	&push_dist_common ('aclocal.m4');
 
 	if (open (ACLOCAL, '< aclocal.m4'))
@@ -2131,19 +2153,19 @@ sub handle_configure
 	if &variable_defined ('SUBDIRS') && ! $seen_make_set;
 
     local ($top_reldir);
+    local ($xform) = ('s/\@ARGS\@/--strictness=' . $strictness_name
+		      . ($cygnus_mode ? ' --cygnus' : '')
+		      . '/;');
     if ($relative_dir ne '.')
     {
 	# In subdirectory.
-	$output_rules .= &file_contents ('remake-subd');
+	$output_rules .= &file_contents_with_transform ($xform, 'remake-subd');
 	$top_reldir = '../';
     }
     else
     {
 	&handle_aclocal_m4;
-	$output_rules .= &file_contents_with_transform ('s/\@STRICTNESS\@/'
-							. $strictness_name
-							. '/g',
-							'remake');
+	$output_rules .= &file_contents_with_transform ($xform, 'remake');
 	&examine_variable ('CONFIGURE_DEPENDENCIES');
 	$top_reldir = '';
     }
@@ -2158,27 +2180,30 @@ sub handle_configure
 				      $FOREIGN, $ch_sans_dir);
 
 	# Header defined and in this directory.
+	local (@files);
 	if (-f $relative_dir . '/acconfig.h')
 	{
-	    &define_variable ("ACCONFIG", "acconfig.h");
-	    &push_dist_common ('acconfig.h');
+	    push (@files, 'acconfig.h');
 	}
 	if (-f $config_name . '.top')
 	{
-	    &define_variable ("CONFIG_TOP", "${cn_sans_dir}.top");
-	    &push_dist_common ($cn_sans_dir . '.top');
+	    push (@files, "${cn_sans_dir}.top");
 	}
 	if (-f $config_name . '.bot')
 	{
-	    &define_variable ("CONFIG_BOT", "${cn_sans_dir}.bot");
-	    &push_dist_common ($cn_sans_dir . '.bot');
+	    push (@files, "${cn_sans_dir}.bot");
 	}
 
+	&push_dist_common (@files);
+	$output_rules .= &file_contents_with_transform ('s/\@FILES\@/'
+							. join (' ', @files)
+							. '/;',
+							'remake-hdr');
+
 	&touch ($relative_dir . '/stamp-h.in');
 	&require_file_with_conf_line ($config_header_line, $FOREIGN,
 				      'stamp-h.in');
 
-	$output_rules .= &file_contents ('remake-hdr');
 	push (@clean, 'hdr');
 	&push_phony_cleaners ('hdr');
 	&define_variable ("CONFIG_HEADER_IN", "${ch_sans_dir}");
@@ -2398,6 +2423,22 @@ sub handle_merge_targets
     &do_one_merge_target ('check', @check);
     &do_one_merge_target ('installcheck', @installcheck);
 
+    if (defined $options{'no-installinfo'})
+    {
+	# FIXME: this is kind of a hack; should find another way to
+	# know that this is required.
+	local (@dirs);
+	if (grep ($_ eq 'install-info-am', @phony))
+	{
+	    push (@dirs, 'install-info-am');
+	}
+	if (&variable_defined ('SUBDIRS'))
+	{
+	    push (@dirs, 'install-info-recursive');
+	}
+	&do_one_merge_target ('install-info', @dirs);
+    }
+
     # Handle the various install targets specially.  We do this so
     # that (eg) "make install-exec" will run "install-exec-recursive"
     # if required, but "make install" won't run it twice.  Step one is
@@ -2693,7 +2734,19 @@ sub handle_tests
     {
 	push (@check, 'check-DEJAGNU');
 	push (@phony, 'check-DEJAGNU');
-	$output_rules .= &file_contents ('dejagnu') . "\n";
+
+	local ($xform);
+	if (! $cygnus_mode)
+	{
+	    $xform = 'next if /^CYGNUS/;';
+	}
+	$output_rules .= &file_contents_with_transform ($xform, 'dejagnu');
+
+	# In Cygnus mode, these are found in the build tree.
+	# Otherwise they are looked for in $PATH.
+	&define_program_variable ('EXPECT', 'build', 'expect', 'expect');
+	&define_program_variable ('RUNTEST', 'src', 'dejagnu', 'runtest');
+
 	# Note that in the rule we don't directly generate site.exp to
 	# avoid the possibility of a corrupted site.exp if make is
 	# interrupted.  Jim Meyering has some useful text on this
@@ -3092,6 +3145,22 @@ sub scan_configure
 
 ################################################################
 
+# Set up for Cygnus mode.
+sub check_cygnus
+{
+    return unless $cygnus_mode;
+
+    &set_strictness ('foreign');
+    $options{'no-installinfo'} = 1;
+    $options{'no-dependencies'} = 1;
+    $use_dependencies = 0;
+
+    if (! $seen_maint_mode)
+    {
+	&am_conf_error ("\`AM_MAINTAINER_MODE' required when --cygnus specified");
+    }
+}
+
 # Do any extra checking for GNU standards.
 sub check_gnu_standards
 {
@@ -3304,6 +3373,35 @@ sub define_configure_variable
     &define_variable ($var, $value);
 }
 
+# Define a variable that represents a program to run.  If in Cygnus
+# mode, the program is searched for in the build (or source) tree.
+# Otherwise no searching is done at all.  Arguments are:
+# * VAR      Name of variable to define
+# * WHATDIR  Either `src' or `build', depending on where program should
+#            be found.  (runtest is in srcdir!)
+# * SUBDIR   Subdir of top-level dir
+# * PROGRAM  Name of program
+sub define_program_variable
+{
+    local ($var, $whatdir, $subdir, $program) = @_;
+
+    if ($cygnus_mode)
+    {
+	local ($full) = ('$(top_' . $whatdir . 'dir)/../'
+			 . $subdir . '/' . $program);
+	&define_variable ($var, ('`if test -f ' . $full
+				 . '; then echo ' . $full . '; else echo '
+				 . $program . '; fi`'));
+    }
+    else
+    {
+	&define_variable ($var, $program);
+    }
+}
+
+
+################################################################
+
 # Read Makefile.am and set up %contents.  Simultaneously copy lines
 # from Makefile.am into $output_trailer or $output_vars as
 # appropriate.  NOTE we put rules in the trailer section.  We want
@@ -3573,6 +3671,7 @@ sub initialize_global_constants
   -a, --add-missing     add missing standard files to package
   --amdir=DIR           directory storing config files
   --build-dir=DIR       directory where build being done (for dependencies)
+  --cygnus              assume program is part of Cygnus-style tree
   --foreign             same as --strictness=foreign
   --gnits               same as --strictness=gnits
   --gnu                 same as --strictness=gnu
diff --git a/dejagnu.am b/dejagnu.am
index 189394855..dbb54bf92 100644
--- a/dejagnu.am
+++ b/dejagnu.am
@@ -16,18 +16,6 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
-## Work if expect is in our tree.
-EXPECT = ` \
-  if [ -f $$rootme/../expect/expect ] ; then \
-    echo $$rootme/../expect/expect ; \
-  else echo expect ; fi`
-
-## If DejaGNU is in our tree, we must run it out of srcdir.
-RUNTEST = ` \
-  if [ -f $(top_srcdir)/../dejagnu/runtest ] ; then \
-    echo $(top_srcdir)/../dejagnu/runtest ; \
-  else echo runtest ;  fi`
-
 ## Flags for DejaGNU.
 RUNTESTFLAGS =
 
@@ -35,13 +23,13 @@ RUNTESTFLAGS =
 DEJATOOL = $(PACKAGE)
 
 check-DEJAGNU: site.exp
-	rootme=`cd $(top_builddir) && pwd`; \
 ## Life is easiest with an absolute srcdir, so do that.
 	srcdir=`cd $(srcdir) && pwd`; export srcdir; \
 	EXPECT=$(EXPECT); export EXPECT; \
 ## Allow this to work when expect and DejaGNU are in tree.
-	if [ -f $$rootme/../expect/expect ]; then \
-	  TCL_LIBRARY=`cd $(top_srcdir)/../tcl/library && pwd`; \
-	  export TCL_LIBRARY; \
-	fi; \
+## Only required when --cygnus in force.
+CYGNUS	if [ -f $(top_builddir)/../expect/expect ]; then \
+CYGNUS	  TCL_LIBRARY=`cd $(top_srcdir)/../tcl/library && pwd`; \
+CYGNUS	  export TCL_LIBRARY; \
+CYGNUS	fi; \
 	$(RUNTEST) --tool $(DEJATOOL) --srcdir $$srcdir $(RUNTESTFLAGS)
diff --git a/lib/am/Makefile.am b/lib/am/Makefile.am
index a689a2651..53cc173f2 100644
--- a/lib/am/Makefile.am
+++ b/lib/am/Makefile.am
@@ -14,7 +14,7 @@ compile.am data.am dejagnu.am depend.am depend2.am dist-vars.am footer.am \
 header.am header-vars.am kr-extra.am libs.am library.am \
 mans-vars.am program.am progs.am remake-hdr.am remake-subd.am \
 remake.am scripts.am subdirs.am tags.am tags-subd.am tags-clean.am \
-texi-vers.am texi-vars.am texinfos.am libs-clean.am \
+texi-vers.am texinfos.am libs-clean.am \
 progs-clean.am data-clean.am COPYING INSTALL texinfo.tex ansi2knr.c \
 ansi2knr.1 aclocal.m4 lisp.am lisp-clean.am
 
diff --git a/lib/am/dejagnu.am b/lib/am/dejagnu.am
index 189394855..dbb54bf92 100644
--- a/lib/am/dejagnu.am
+++ b/lib/am/dejagnu.am
@@ -16,18 +16,6 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
-## Work if expect is in our tree.
-EXPECT = ` \
-  if [ -f $$rootme/../expect/expect ] ; then \
-    echo $$rootme/../expect/expect ; \
-  else echo expect ; fi`
-
-## If DejaGNU is in our tree, we must run it out of srcdir.
-RUNTEST = ` \
-  if [ -f $(top_srcdir)/../dejagnu/runtest ] ; then \
-    echo $(top_srcdir)/../dejagnu/runtest ; \
-  else echo runtest ;  fi`
-
 ## Flags for DejaGNU.
 RUNTESTFLAGS =
 
@@ -35,13 +23,13 @@ RUNTESTFLAGS =
 DEJATOOL = $(PACKAGE)
 
 check-DEJAGNU: site.exp
-	rootme=`cd $(top_builddir) && pwd`; \
 ## Life is easiest with an absolute srcdir, so do that.
 	srcdir=`cd $(srcdir) && pwd`; export srcdir; \
 	EXPECT=$(EXPECT); export EXPECT; \
 ## Allow this to work when expect and DejaGNU are in tree.
-	if [ -f $$rootme/../expect/expect ]; then \
-	  TCL_LIBRARY=`cd $(top_srcdir)/../tcl/library && pwd`; \
-	  export TCL_LIBRARY; \
-	fi; \
+## Only required when --cygnus in force.
+CYGNUS	if [ -f $(top_builddir)/../expect/expect ]; then \
+CYGNUS	  TCL_LIBRARY=`cd $(top_srcdir)/../tcl/library && pwd`; \
+CYGNUS	  export TCL_LIBRARY; \
+CYGNUS	fi; \
 	$(RUNTEST) --tool $(DEJATOOL) --srcdir $$srcdir $(RUNTESTFLAGS)
diff --git a/lib/am/remake-hdr.am b/lib/am/remake-hdr.am
index d3a695b88..3b3110c72 100644
--- a/lib/am/remake-hdr.am
+++ b/lib/am/remake-hdr.am
@@ -16,13 +16,13 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 $(CONFIG_HEADER): stamp-h
-stamp-h: $(CONFIG_HEADER_IN) config.status
+stamp-h: $(CONFIG_HEADER_IN) $(top_builddir)/config.status
 	cd $(top_builddir) \
 	  && CONFIG_FILES= CONFIG_HEADERS=$(CONFIG_HEADER) \
 	     $(SHELL) ./config.status
 	@echo timestamp > stamp-h
 $(srcdir)/$(CONFIG_HEADER_IN): @MAINT@stamp-h.in
-$(srcdir)/stamp-h.in: configure.in $(ACLOCAL) $(ACCONFIG) $(CONFIG_TOP) $(CONFIG_BOT)
+$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL) @FILES@
 	cd $(top_srcdir) && autoheader
 	echo timestamp > $(srcdir)/stamp-h.in
 
diff --git a/lib/am/subdirs.am b/lib/am/subdirs.am
index 42bcfac3b..ed0da37f0 100644
--- a/lib/am/subdirs.am
+++ b/lib/am/subdirs.am
@@ -25,7 +25,7 @@
 @SET_MAKE@
 
 all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive \
+installdirs-recursive install-recursive uninstall-recursive @INSTALLINFO@ \
 check-recursive installcheck-recursive info-recursive dvi-recursive \
 mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index 78de7dd22..dee8d6167 100644
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -22,7 +22,10 @@
 	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
 
 .texi.dvi:
-	TEXINPUTS=$(srcdir):$$TEXINPUTS $(TEXI2DVI) $<
+	TEXINPUTS=$(srcdir):$$TEXINPUTS \
+## Must set MAKEINFO like this so that version.texi will be found even
+## if it is in srcdir.
+	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
 
 .texinfo.info:
 ## We want to force the .info file to be built in srcdir.  This is
@@ -36,7 +39,9 @@
 ## Look in both . and srcdir because the info pages might have been
 ## rebuilt in the build directory.  Can't cd to srcdir; that might
 ## break a possible install-sh reference.
-install-info: $(INFO_DEPS)
+## Funny name due to --cygnus influence; we want to reserve
+## `install-info' for the user.
+install-info-am: $(INFO_DEPS)
 	$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(infodir)
 	for file in $(INFO_DEPS); do \
diff --git a/m4/Makefile.in b/m4/Makefile.in
index 23a41191e..2a2bbaffa 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -37,6 +37,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
+PERL = @PERL@
 
 AUTOMAKE_OPTIONS = gnits
 MAINT_CHARSET = latin1
@@ -70,7 +71,8 @@ $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in
 	cd $(top_srcdir) && automake $(subdir)/Makefile
 
 Makefile: $(top_builddir)/config.status $(srcdir)/Makefile.in $(BUILT_SOURCES)
-	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 install-m4dataDATA: $(m4data_DATA)
 	$(NORMAL_INSTALL)
diff --git a/remake-hdr.am b/remake-hdr.am
index d3a695b88..3b3110c72 100644
--- a/remake-hdr.am
+++ b/remake-hdr.am
@@ -16,13 +16,13 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 $(CONFIG_HEADER): stamp-h
-stamp-h: $(CONFIG_HEADER_IN) config.status
+stamp-h: $(CONFIG_HEADER_IN) $(top_builddir)/config.status
 	cd $(top_builddir) \
 	  && CONFIG_FILES= CONFIG_HEADERS=$(CONFIG_HEADER) \
 	     $(SHELL) ./config.status
 	@echo timestamp > stamp-h
 $(srcdir)/$(CONFIG_HEADER_IN): @MAINT@stamp-h.in
-$(srcdir)/stamp-h.in: configure.in $(ACLOCAL) $(ACCONFIG) $(CONFIG_TOP) $(CONFIG_BOT)
+$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL) @FILES@
 	cd $(top_srcdir) && autoheader
 	echo timestamp > $(srcdir)/stamp-h.in
 
diff --git a/remake-subd.am b/remake-subd.am
index 4dfce4c3f..90c34f230 100644
--- a/remake-subd.am
+++ b/remake-subd.am
@@ -16,7 +16,7 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 $(srcdir)/Makefile.in: @MAINT@Makefile.am $(top_srcdir)/configure.in
-	cd $(top_srcdir) && automake $(subdir)/Makefile
+	cd $(top_srcdir) && automake @ARGS@ $(subdir)/Makefile
 
 Makefile: $(top_builddir)/config.status $(srcdir)/Makefile.in $(BUILT_SOURCES)
 	cd $(top_builddir) \
diff --git a/remake.am b/remake.am
index 2bbf381a5..5b75d4b08 100644
--- a/remake.am
+++ b/remake.am
@@ -16,7 +16,7 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 $(srcdir)/Makefile.in: @MAINT@Makefile.am configure.in
-	cd $(srcdir) && automake --strictness=@STRICTNESS@ Makefile
+	cd $(srcdir) && automake @ARGS@ Makefile
 
 # For an explanation of the following Makefile rules, see node
 # `Automatic Remaking' in GNU Autoconf documentation.
diff --git a/subdirs.am b/subdirs.am
index 42bcfac3b..ed0da37f0 100644
--- a/subdirs.am
+++ b/subdirs.am
@@ -25,7 +25,7 @@
 @SET_MAKE@
 
 all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive \
+installdirs-recursive install-recursive uninstall-recursive @INSTALLINFO@ \
 check-recursive installcheck-recursive info-recursive dvi-recursive \
 mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
diff --git a/tests/Makefile.in b/tests/Makefile.in
index b8a684835..7588cc58e 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -37,6 +37,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
+PERL = @PERL@
 
 AUTOMAKE_OPTIONS = gnits
 
diff --git a/texi-vars.am b/texi-vars.am
deleted file mode 100644
index c78de0442..000000000
--- a/texi-vars.am
+++ /dev/null
@@ -1,19 +0,0 @@
-## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996 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
-## the Free Software Foundation; either version 2, or (at your option)
-## any later version.
-
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
-MAKEINFO = makeinfo
-TEXI2DVI = texi2dvi
diff --git a/texinfos.am b/texinfos.am
index 78de7dd22..dee8d6167 100644
--- a/texinfos.am
+++ b/texinfos.am
@@ -22,7 +22,10 @@
 	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
 
 .texi.dvi:
-	TEXINPUTS=$(srcdir):$$TEXINPUTS $(TEXI2DVI) $<
+	TEXINPUTS=$(srcdir):$$TEXINPUTS \
+## Must set MAKEINFO like this so that version.texi will be found even
+## if it is in srcdir.
+	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
 
 .texinfo.info:
 ## We want to force the .info file to be built in srcdir.  This is
@@ -36,7 +39,9 @@
 ## Look in both . and srcdir because the info pages might have been
 ## rebuilt in the build directory.  Can't cd to srcdir; that might
 ## break a possible install-sh reference.
-install-info: $(INFO_DEPS)
+## Funny name due to --cygnus influence; we want to reserve
+## `install-info' for the user.
+install-info-am: $(INFO_DEPS)
 	$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(infodir)
 	for file in $(INFO_DEPS); do \