This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Patch to call install-info even when dir file absent


This patch ensures install-info is called when installing info files even
if the dir file is absent, so it gets created if installing into an
otherwise unused prefix (otherwise, only the fastjar manuals get entries
in the dir file, as only that directory creates it, after the other
manuals have been installed).  Bootstrapped and installed with no
regressions on i686-pc-linux-gnu.  OK to commit to mainline and 3.4
branch?  (On 3.3 branch, some front ends - with their own rules in
Make-lang.in - called install-info regardless of whether the dir file was
present, so this is a regression.)

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.

--- GCC/gcc/Makefile.in.orig	2004-04-28 09:41:53.000000000 +0000
+++ GCC/gcc/Makefile.in	2004-04-28 10:02:39.000000000 +0000
@@ -2985,10 +2985,8 @@
 	  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;
 

-- 
Joseph S. Myers
jsm@polyomino.org.uk


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]