* 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.

5 files changed, 63 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 7a9440d98..f744fd089 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-11-18  Maciej W. Rozycki  <macro@ds2.pg.gda.pl>  (tiny change)
+	    Alexandre Duret-Lutz  <adl@gnu.org>
+
+	* 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.
+
 2003-11-18  Paolo Bonzini  <bonzini@gnu.org>
 	    Alexandre Duret-Lutz  <adl@gnu.org>
 
diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index 162dd454c..bc02a66e0 100644
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -110,6 +110,7 @@ if %?LOCAL-TEXIS%
 am__installdirs += $(DESTDIR)$(infodir)
 install-data-am: install-info-am
 endif %?LOCAL-TEXIS%
+endif %?INSTALL-INFO%
 .PHONY: install-info
 if %?SUBDIRS%
 RECURSIVE_TARGETS += install-info-recursive
@@ -117,7 +118,6 @@ install-info: install-info-recursive
 else !%?SUBDIRS%
 install-info: install-info-am
 endif !%?SUBDIRS%
-endif %?INSTALL-INFO%
 
 .PHONY: install-info-am
 if %?LOCAL-TEXIS%
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8bc3b20c4..8625e336a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -484,6 +484,7 @@ txinfo23.test \
 txinfo24.test \
 txinfo25.test \
 txinfo26.test \
+txinfo27.test \
 transform.test \
 unused.test \
 vars.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 8747c89d4..5c2ff2268 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -598,6 +598,7 @@ txinfo23.test \
 txinfo24.test \
 txinfo25.test \
 txinfo26.test \
+txinfo27.test \
 transform.test \
 unused.test \
 vars.test \
diff --git a/tests/txinfo27.test b/tests/txinfo27.test
new file mode 100755
index 000000000..4ae7e52a6
--- /dev/null
+++ b/tests/txinfo27.test
@@ -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
+@setfilename main.info
+@settitle main
+@node Top
+Hello walls.
+@include version.texi
+@bye
+END
+
+
+$ACLOCAL
+$AUTOMAKE --add-missing
+$AUTOCONF
+
+./configure --prefix=`pwd`/inst --infodir=`pwd`/inst/info
+$MAKE install-info
+test -f inst/info/main.info