From: Tom Tromey Date: Wed, 16 Sep 1998 04:23:41 +0000 (+0000) Subject: A couple fixes from Per Cederqvist X-Git-Tag: Release-1-3d~89 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1198063a90c41dc1babd74f2b2bb149ea228905b;p=thirdparty%2Fautomake.git A couple fixes from Per Cederqvist --- diff --git a/ChangeLog b/ChangeLog index 24835c3d6..a5a6fada4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +Mon Sep 14 08:27:38 1998 Per Cederqvist + + * automake.in (handle_texinfo): The logic for when to provide + texinfo.tex was broken. Attempt to fix. + +Mon Sep 14 00:55:12 1998 Per Cederqvist + + Fix for Dynix 3.1.1. + * automake.in (handle_yacc_lex_cxx): Transform "# " to "#line"; + some compilers (such as /bin/cc on Dynix 3.1.1) don't accept the + output from the preprocessor. + Tue Aug 25 18:40:51 1998 Tom Tromey * automake.in (handle_tests): Don't create site.exp target if it diff --git a/THANKS b/THANKS index 4da75b5ec..e532f5191 100644 --- a/THANKS +++ b/THANKS @@ -61,6 +61,7 @@ Nyul Laszlo nyul@sol.cc.u-szeged.hu Paul D. Smith psmith@BayNetworks.COM Paul Eggert eggert@twinsun.com Per Bothner bothner@cygnus.com +Per Cederqvist ceder@lysator.liu.se Peter Mattis petm@scam.XCF.Berkeley.EDU Phil Nelson phil@cs.wwu.edu Ralph Schleicher rs@purple.UL.BaWue.DE diff --git a/automake.in b/automake.in index dd90e160b..7cb9c8b12 100755 --- a/automake.in +++ b/automake.in @@ -1035,6 +1035,7 @@ sub handle_yacc_lex_cxx . '`if test -f $(srcdir)/' . $base . '.c' . '; then echo $(srcdir)/' . $base . '.c' . '; else echo ' . $base . '.c; fi` ' + . "| sed 's/^# \\([0-9]\\)/#line \\1/' " . '| $(ANSI2KNR) > ' . $base . "_.c\n"); push (@objects, $base . '_.o'); push (@objects, $base . '_.lo') if $seen_libtool; @@ -2150,9 +2151,10 @@ sub handle_texinfo { &define_variable ('TEXINFO_TEX', $config_aux_dir . '/texinfo.tex'); } - elsif (! &variable_defined ('TEXINFO_TEX')) + elsif (&variable_defined ('TEXINFO_TEX')) { - &define_variable ('TEXINFO_TEX', '$(srcdir)/texinfo.tex'); + # The user defined TEXINFO_TEX so assume he knows what he is + # doing. } else { diff --git a/tests/ChangeLog b/tests/ChangeLog index 7da2b4042..ac17623d2 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,7 @@ +Tue Sep 15 22:19:48 1998 Tom Tromey + + * texinfo7.test: New file. + Sun Aug 16 23:17:38 1998 Tom Tromey * colon6.test: New file. diff --git a/tests/Makefile.am b/tests/Makefile.am index 18457f910..aa3f33c9b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -32,7 +32,7 @@ texinfo5.test aclocali.test texinfo6.test condman2.test colon4.test \ java.test sinclude.test javaprim.test javasubst.test aclocalii.test \ lex2.test libobj8.test version3.test instdata.test exdir2.test \ colon5.test library.test syntax.test cond4.test cond5.test recurs.test \ -ansi3.test cond6.test colon6.test +ansi3.test cond6.test colon6.test texinfo7.test EXTRA_DIST = defs $(TESTS) diff --git a/tests/Makefile.in b/tests/Makefile.in index 50d83be18..885d166c8 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -95,7 +95,7 @@ texinfo5.test aclocali.test texinfo6.test condman2.test colon4.test \ java.test sinclude.test javaprim.test javasubst.test aclocalii.test \ lex2.test libobj8.test version3.test instdata.test exdir2.test \ colon5.test library.test syntax.test cond4.test cond5.test recurs.test \ -ansi3.test cond6.test colon6.test +ansi3.test cond6.test colon6.test texinfo7.test EXTRA_DIST = defs $(TESTS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/tests/texinfo7.test b/tests/texinfo7.test new file mode 100755 index 000000000..b98121312 --- /dev/null +++ b/tests/texinfo7.test @@ -0,0 +1,18 @@ +#! /bin/sh + +# Test to make sure texinfo.tex correctly installed by -a. Bug report +# by Per Cederqvist. + +. $srcdir/defs || exit 1 + +cat > Makefile.am << 'END' +info_TEXINFOS = textutils.texi +magic: + @echo $(DISTFILES) +END + +echo '@setfilename textutils.info' > textutils.texi + +$AUTOMAKE -a || exit 1 + +test -f texinfo.tex