Makefile.in ($(DESTDIR)$(infodir)/%.info): Don't condition calling install-info on...

	* Makefile.in ($(DESTDIR)$(infodir)/%.info): Don't condition
	calling install-info on $(DESTDIR)$(infodir)/dir already being
	present.

From-SVN: r81256

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 69cafbbc6a8906daf80c0a77e2c410b270c7d21b..72cdbcbd540e1ca06fa4c916a5811ac2585a2825 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-28  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+       * Makefile.in ($(DESTDIR)$(infodir)/%.info): Don't condition
+       calling install-info on $(DESTDIR)$(infodir)/dir already being
+       present.
+
 2004-04-28  Paul Brook  <paul@codesourcery.com>
 
        * dwarf2out.c (mem_loc_descriptor): Handle shifts.

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 4b718d503d70dc5100f66c828b9d7dccc0a6b410..e2d74e73678875527fa8607efc2839907b54f37a 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -2985,10 +2985,8 @@ $(DESTDIR)$(infodir)/%.info: doc/%.info installdirs
          done; \
        else true; fi
        -if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
-         if [ -f $(DESTDIR)$(infodir)/dir ] ; then \
-           if [ -f $@ ]; then \
-             install-info --dir-file=$(DESTDIR)$(infodir)/dir $@; \
-           else true; fi; \
+         if [ -f $@ ]; then \
+           install-info --dir-file=$(DESTDIR)$(infodir)/dir $@; \
          else true; fi; \
        else true; fi;