From: Joseph Myers <jsm@polyomino.org.uk>
Date: Wed, 28 Apr 2004 18:00:05 +0000 (+0100)
Subject: Makefile.in ($(DESTDIR)$(infodir)/%.info): Don't condition calling install-info on... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a89f5df3d9325c1d5d9ed7f92abd6c61f9df8631;p=gcc.git

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

	* 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 69cafbbc6a8..72cdbcbd540 100644
--- 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 4b718d503d7..e2d74e73678 100644
--- 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;