diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Makefile.in | 5 | ||||
| -rwxr-xr-x | automake.in | 52 | ||||
| -rw-r--r-- | lib/am/texinfos.am | 29 | ||||
| -rw-r--r-- | m4/Makefile.in | 1 | ||||
| -rw-r--r-- | tests/Makefile.in | 1 | ||||
| -rw-r--r-- | texinfos.am | 29 |
7 files changed, 73 insertions, 52 deletions
@@ -1,5 +1,13 @@ 2001-05-08 Akim Demaille <akim@epita.fr> + * automake.in (&define_program_variable): Remove. + (&scan_one_autoconf_file): Skip MAKEINFO when found in an + AM_MISSING_PROG. + (&handle_texinfo): Don't define MAKEINFO and TEXI2DVI. + * texinfos.am: Do it. + +2001-05-08 Akim Demaille <akim@epita.fr> + * automake.in (&handle_tests_dejagnu): Don't define EXPECT and RUNTEST. * dejagnu.am: Do it. diff --git a/Makefile.in b/Makefile.in index 664669404..eb004c38d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -64,7 +64,6 @@ AWK = @AWK@ DEPDIR = @DEPDIR@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@ -MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ PERL = @PERL@ STRIP = @STRIP@ @@ -121,7 +120,6 @@ CONFIG_CLEAN_FILES = automake aclocal SCRIPTS = $(bin_SCRIPTS) DIST_SOURCES = -TEXI2DVI = texi2dvi INFO_DEPS = automake.info DVIS = automake.dvi TEXINFOS = automake.texi @@ -226,6 +224,9 @@ automake.dvi: automake.texi $(srcdir)/version.texi cd $(srcdir) \ && $(MAKEINFO) `echo $< | sed 's,.*/,,'` +MAKEINFO = @MAKEINFO@ +TEXI2DVI = texi2dvi + DVIPS = dvips .dvi.ps: $(DVIPS) $< -o $@ diff --git a/automake.in b/automake.in index 701b0f669..b7261a966 100755 --- a/automake.in +++ b/automake.in @@ -2879,16 +2879,6 @@ sub handle_texinfo push (@dvis_list, $infobase . '.dvi'); } - # 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', - # Circumlocution to avoid accidental - # configure substitution. - '@MAKE' . 'INFO@'); - &define_program_variable ('TEXI2DVI', 'src', 'texinfo/util', - 'texi2dvi'); - # Handle location of texinfo.tex. my $need_texi_file = 0; my $texinfodir; @@ -4638,7 +4628,10 @@ sub scan_one_autoconf_file && $1 ne 'ACLOCAL' && $1 ne 'AUTOCONF' && $1 ne 'AUTOMAKE' - && $1 ne 'AUTOHEADER') + && $1 ne 'AUTOHEADER' + # AM_INIT_AUTOMAKE is AM_MISSING_PROG'ing MAKEINFO. But + # we handle it elsewhere. + && $1 ne 'MAKEINFO') { $configure_vars{$1} = $filename . ':' . $.; } @@ -6409,43 +6402,6 @@ sub define_compiler_variable if $seen_libtool; } - -# define_program_variable ($VAR, $WHATDIR, $SUBDIR, $PROGRAM, $OVERRIDE) -# ---------------------------------------------------------------------- -# 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 -# * OVERRIDE If specified, the name of the program to use when not in -# Cygnus mode. Defaults to PROGRAM. -sub define_program_variable -{ - my ($var, $whatdir, $subdir, $program, $override) = @_; - - if (! $override) - { - $override = $program; - } - - if ($cygnus_mode) - { - my $full = ('$(top_' . $whatdir . 'dir)/../' - . $subdir . '/' . $program); - &define_variable ($var, ('`if test -f ' . $full - . '; then echo ' . $full . '; else echo ' - . $program . '; fi`')); - } - else - { - &define_variable ($var, $override); - } -} - - ################################################################ ## ---------------- ## diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am index 4864ce027..cdffb1797 100644 --- a/lib/am/texinfos.am +++ b/lib/am/texinfos.am @@ -17,6 +17,35 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. +## ----------- ## +## Variables. ## +## ----------- ## + +if ! %?CYGNUS% +MAKEINFO = @MAKEINFO@ +TEXI2DVI = texi2dvi + +else %?CYGNUS% + +## Find these programs wherever they may lie. Yes, this has +## intimate knowledge of the structure of the texinfo distribution. +MAKEINFO = `if test -f $(top_builddir)/../texinfo/makeinfo/makeinfo; then \ + echo $(top_builddir)/../texinfo/makeinfo/makeinfo; \ + else \ + echo makeinfo; \ + fi` + +TEXI2DVI = `if test -f $(top_srcdir)/../texinfo/util/texi2dvi; then \ + echo $(top_srcdir)/../texinfo/util/texi2dvi; \ + else \ + echo texi2dvi; \ + fi` +endif %?CYGNUS% + +## ---------- ## +## Building. ## +## ---------- ## + ## The way to make PostScript, for those who want it. DVIPS = dvips .dvi.ps: diff --git a/m4/Makefile.in b/m4/Makefile.in index c338bc7cc..8a9a4fe37 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -64,7 +64,6 @@ AWK = @AWK@ DEPDIR = @DEPDIR@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@ -MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ PERL = @PERL@ STRIP = @STRIP@ diff --git a/tests/Makefile.in b/tests/Makefile.in index 0383a090d..91137d9b4 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -64,7 +64,6 @@ AWK = @AWK@ DEPDIR = @DEPDIR@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@ -MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ PERL = @PERL@ STRIP = @STRIP@ diff --git a/texinfos.am b/texinfos.am index 4864ce027..cdffb1797 100644 --- a/texinfos.am +++ b/texinfos.am @@ -17,6 +17,35 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. +## ----------- ## +## Variables. ## +## ----------- ## + +if ! %?CYGNUS% +MAKEINFO = @MAKEINFO@ +TEXI2DVI = texi2dvi + +else %?CYGNUS% + +## Find these programs wherever they may lie. Yes, this has +## intimate knowledge of the structure of the texinfo distribution. +MAKEINFO = `if test -f $(top_builddir)/../texinfo/makeinfo/makeinfo; then \ + echo $(top_builddir)/../texinfo/makeinfo/makeinfo; \ + else \ + echo makeinfo; \ + fi` + +TEXI2DVI = `if test -f $(top_srcdir)/../texinfo/util/texi2dvi; then \ + echo $(top_srcdir)/../texinfo/util/texi2dvi; \ + else \ + echo texi2dvi; \ + fi` +endif %?CYGNUS% + +## ---------- ## +## Building. ## +## ---------- ## + ## The way to make PostScript, for those who want it. DVIPS = dvips .dvi.ps: |