From 9e76ccba317b51af267ab4bba623abacc13548fe Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 16 Apr 1997 06:28:58 +0000 Subject: [PATCH] makeinfo bug fixes --- ChangeLog | 7 +++++++ Makefile.in | 18 +++++++++++------- automake.in | 18 +++++++++++++++--- m4/Makefile.in | 5 +++++ tests/Makefile.in | 5 +++++ 5 files changed, 43 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index b4f27b450..b7c644421 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Wed Apr 16 00:05:47 1997 Tom Tromey + + * automake.in (define_program_variable): Added `override' argument. + (handle_texinfo): Pass override arg when defining MAKEINFO. + (AC_MISSING_PROG): New constant. + (scan_one_configure_file): Use it. + Tue Apr 15 12:12:28 1997 Tom Tromey * automake.in (handle_texinfo): In --cygnus mode, reserve diff --git a/Makefile.in b/Makefile.in index 1d22e95b0..8eeec7127 100644 --- a/Makefile.in +++ b/Makefile.in @@ -49,6 +49,11 @@ POST_INSTALL = true NORMAL_UNINSTALL = true PRE_UNINSTALL = true POST_UNINSTALL = true +ACLOCAL = @ACLOCAL@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ PERL = @PERL@ TAR = @TAR@ @@ -85,7 +90,6 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = automake aclocal SCRIPTS = $(bin_SCRIPTS) $(pkgdata_SCRIPTS) -MAKEINFO = makeinfo TEXI2DVI = texi2dvi TEXINFO_TEX = $(srcdir)/texinfo.tex INFO_DEPS = automake.info @@ -262,17 +266,17 @@ dist-info: $(INFO_DEPS) done; \ done -mostlyclean-info: +mostlyclean-aminfo: rm -f automake.aux automake.cp automake.cps automake.dvi automake.fn \ automake.fns automake.ky automake.log automake.pg \ automake.toc automake.tp automake.tps automake.vr \ automake.vrs automake.op automake.tr automake.cv -clean-info: +clean-aminfo: -distclean-info: +distclean-aminfo: -maintainer-clean-info: +maintainer-clean-aminfo: for i in $(INFO_DEPS); do rm -f `eval echo $$i*`; done install-pkgdataDATA: $(pkgdata_DATA) @@ -471,8 +475,8 @@ maintainer-clean: maintainer-clean-recursive maintainer-clean-am .PHONY: default uninstall-binSCRIPTS install-binSCRIPTS \ uninstall-pkgdataSCRIPTS install-pkgdataSCRIPTS mostlyclean-vti \ 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 \ +uninstall-info mostlyclean-aminfo distclean-aminfo clean-aminfo \ +maintainer-clean-aminfo uninstall-pkgdataDATA install-pkgdataDATA \ install-data-recursive uninstall-data-recursive install-exec-recursive \ uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ all-recursive check-recursive installcheck-recursive info-recursive \ diff --git a/automake.in b/automake.in index 40a57075c..025e88b0c 100755 --- a/automake.in +++ b/automake.in @@ -51,6 +51,7 @@ $AM_INIT_AUTOMAKE_PATTERN = "AM_INIT_AUTOMAKE\\([^,]*,([^,)]+)[,)]"; $AM_PACKAGE_VERSION_PATTERN = "^\\s*\\[?([^]\\s]+)\\]?\\s*\$"; # Note that there is no AC_PATH_TOOL. But we don't really care. $AC_CHECK_PATTERN = "AC_(CHECK|PATH)_(PROG|PROGS|TOOL)\\(\\[?(\\w+)"; +$AM_MISSING_PATTERN = "AM_MISSING_PROG\\(\\[?(\\w+)"; # Just check for alphanumeric in AC_SUBST. If you do AC_SUBST(5), # then too bad. $AC_SUBST_PATTERN = "AC_SUBST\\(\\[?(\\w+)"; @@ -1907,7 +1908,7 @@ sub handle_texinfo # 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@'); + 'makeinfo', '@MAKEINFO@'); &define_program_variable ('TEXI2DVI', 'src', 'texinfo/util', 'texi2dvi'); @@ -3806,6 +3807,10 @@ sub scan_one_configure_file { $configure_vars{$3} = 1; } + if (/$AM_MISSING_PATTERN/o) + { + $configure_vars{$1} = 1; + } # Explicitly avoid ANSI2KNR -- we AC_SUBST that in protos.m4, # but later define it elsewhere. This is pretty hacky. We @@ -4168,9 +4173,16 @@ sub define_configure_variable # be found. (runtest is in srcdir!) # * SUBDIR Subdir of top-level dir # * PROGRAM Name of program +# * OVERRIDE If specified, the name of the program to use when not in +# Cygnus mode. Defaults to PROGRAM. sub define_program_variable { - local ($var, $whatdir, $subdir, $program) = @_; + local ($var, $whatdir, $subdir, $program, $override) = @_; + + if (! $override) + { + $override = $program; + } if ($cygnus_mode) { @@ -4182,7 +4194,7 @@ sub define_program_variable } else { - &define_variable ($var, $program); + &define_variable ($var, $override); } } diff --git a/m4/Makefile.in b/m4/Makefile.in index 0aacb899a..184071b62 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -49,6 +49,11 @@ POST_INSTALL = true NORMAL_UNINSTALL = true PRE_UNINSTALL = true POST_UNINSTALL = true +ACLOCAL = @ACLOCAL@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ PERL = @PERL@ TAR = @TAR@ diff --git a/tests/Makefile.in b/tests/Makefile.in index b83a12fe4..499262570 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -49,6 +49,11 @@ POST_INSTALL = true NORMAL_UNINSTALL = true PRE_UNINSTALL = true POST_UNINSTALL = true +ACLOCAL = @ACLOCAL@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ PERL = @PERL@ TAR = @TAR@ -- 2.11.4.GIT