automake-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [patch] trunk, 1.7.9: install-info bug with no-installinfo


From: Alexandre Duret-Lutz
Subject: Re: [patch] trunk, 1.7.9: install-info bug with no-installinfo
Date: Tue, 18 Nov 2003 21:40:37 +0100
User-agent: Gnus/5.1003 (Gnus v5.10.3) Emacs/21.3 (gnu/linux)

>>> "Maciej" == Maciej W Rozycki <address@hidden> writes:

 Maciej> Hello,

 Maciej> Contrary to what's documented, the install-info target
 Maciej> doesn't work with current versions of automake when the
 Maciej> no-installinfo option is active.  I believe the bug
 Maciej> crept in around 1.5.  

Good catch, thanks!

I'm installing the following on HEAD and branch-1-7.

2003-11-18  Maciej W. Rozycki  <address@hidden>  (tiny change)
            Alexandre Duret-Lutz  <address@hidden>

        * lib/am/texinfos.am (install-info): Depend on
        install-info-recursive or install-info-am even if no-installinfo.
        * tests/txinfo27.test: New file.
        * tests/Makefile.am (TESTS): Add txinfo26.test.

Index: lib/am/texinfos.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/texinfos.am,v
retrieving revision 1.110
diff -u -r1.110 texinfos.am
--- lib/am/texinfos.am  14 Nov 2003 21:12:26 -0000      1.110
+++ lib/am/texinfos.am  18 Nov 2003 20:30:23 -0000
@@ -111,13 +111,13 @@
 install-data-am: install-info-am
 endif %?LOCAL-TEXIS%
+endif %?INSTALL-INFO%
 .PHONY: install-info
 if %?SUBDIRS%
 RECURSIVE_TARGETS += install-info-recursive
 install-info: install-info-recursive
 else !%?SUBDIRS%
 install-info: install-info-am
 endif !%?SUBDIRS%
-endif %?INSTALL-INFO%
 
 .PHONY: install-info-am
 if %?LOCAL-TEXIS%
Index: tests/Makefile.am
===================================================================
RCS file: /cvs/automake/automake/tests/Makefile.am,v
retrieving revision 1.529
diff -u -r1.529 Makefile.am
--- tests/Makefile.am   17 Nov 2003 23:18:20 -0000      1.529
+++ tests/Makefile.am   18 Nov 2003 20:30:23 -0000
@@ -484,6 +484,7 @@
 txinfo24.test \
 txinfo25.test \
 txinfo26.test \
+txinfo27.test \
 transform.test \
 unused.test \
 vars.test \
Index: tests/txinfo27.test
===================================================================
RCS file: tests/txinfo27.test
diff -N tests/txinfo27.test
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ tests/txinfo27.test 18 Nov 2003 20:30:24 -0000
@@ -0,0 +1,52 @@
+#! /bin/sh
+# Copyright (C) 2003  Free Software Foundation, Inc.
+#
+# This file is part of GNU Automake.
+#
+# GNU Automake 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.
+#
+# GNU Automake 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 Automake; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+# Make sure install-info works even if no-installinfo is given.
+
+required='makeinfo'
+. ./defs || exit 1
+
+set -e
+
+echo AC_OUTPUT >> configure.in
+
+cat > Makefile.am << 'END'
+info_TEXINFOS = main.texi
+AUTOMAKE_OPTIONS = no-installinfo
+END
+
+cat > main.texi << 'END'
+\input texinfo
address@hidden main.info
address@hidden main
address@hidden Top
+Hello walls.
address@hidden version.texi
address@hidden
+END
+
+
+$ACLOCAL
+$AUTOMAKE --add-missing
+$AUTOCONF
+
+./configure --prefix=`pwd`/inst --infodir=`pwd`/inst/info
+$MAKE install-info
+test -f inst/info/main.info
-- 
Alexandre Duret-Lutz





reply via email to

[Prev in Thread] Current Thread [Next in Thread]