Would it be better to use @MAKEINFO@ instead of `makeinfo' in the else
branch of
+MAKEINFO = `if test -f $(top_builddir)/../texinfo/makeinfo/makeinfo; then \
+ echo $(top_builddir)/../texinfo/makeinfo/makeinfo; \
+ else \
+ echo makeinfo; \
+ fi`
???
Index: ChangeLog
from Akim Demaille <[EMAIL PROTECTED]>
* 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.
Index: automake.in
--- automake.in Sun, 01 Apr 2001 19:58:35 +0200 akim (am/f/39_automake.i 1.249 755)
+++ automake.in Sun, 01 Apr 2001 20:20:37 +0200 akim (am/f/39_automake.i 1.249 755)
@@ -2696,16 +2696,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;
@@ -4350,7 +4340,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 . ':' . $.;
}
@@ -6104,43 +6097,6 @@ sub define_compiler_variable
&define_variable ('LT' . $name, $ltcompile . $value)
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);
- }
-}
-
################################################################
Index: texinfos.am
--- texinfos.am Sun, 01 Apr 2001 19:15:15 +0200 akim (am/g/10_texinfos.a 1.21 644)
+++ texinfos.am Sun, 01 Apr 2001 20:23:27 +0200 akim (am/g/10_texinfos.a 1.21 644)
@@ -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:
Index: Makefile.in
--- Makefile.in Sat, 31 Mar 2001 14:34:20 +0200 akim (am/h/16_Makefile.i 1.64 644)
+++ Makefile.in Sun, 01 Apr 2001 20:17:37 +0200 akim (am/h/16_Makefile.i 1.64 644)
@@ -64,7 +64,6 @@
DEPDIR = @DEPDIR@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
-MAKEINFO = @MAKEINFO@
PACKAGE = @PACKAGE@
PERL = @PERL@
STRIP = @STRIP@
@@ -120,7 +119,6 @@
SCRIPTS = $(bin_SCRIPTS)
DIST_SOURCES =
-TEXI2DVI = texi2dvi
INFO_DEPS = automake.info
DVIS = automake.dvi
TEXINFOS = automake.texi
@@ -224,6 +222,9 @@
@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
cd $(srcdir) \
&& $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+
+MAKEINFO = @MAKEINFO@
+TEXI2DVI = texi2dvi
DVIPS = dvips
.dvi.ps:
Index: m4/Makefile.in
--- m4/Makefile.in Sun, 18 Mar 2001 20:59:31 +0100 akim (am/h/15_Makefile.i 1.37 644)
+++ m4/Makefile.in Sun, 01 Apr 2001 20:17:37 +0200 akim (am/h/15_Makefile.i 1.37 644)
@@ -64,7 +64,6 @@
DEPDIR = @DEPDIR@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
-MAKEINFO = @MAKEINFO@
PACKAGE = @PACKAGE@
PERL = @PERL@
STRIP = @STRIP@
Index: tests/Makefile.in
--- tests/Makefile.in Sat, 31 Mar 2001 13:00:01 +0200 akim (am/h/14_Makefile.i 1.42
644)
+++ tests/Makefile.in Sun, 01 Apr 2001 20:17:37 +0200 akim (am/h/14_Makefile.i 1.42
+644)
@@ -64,7 +64,6 @@
DEPDIR = @DEPDIR@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
-MAKEINFO = @MAKEINFO@
PACKAGE = @PACKAGE@
PERL = @PERL@
STRIP = @STRIP@
