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]

install-info makefile rules


I notice that the install-info rules now depend on the installed
.info files.  E.g.:

  install-info:: doc installdirs \
          $(DESTDIR)$(infodir)/cpp.info \
          $(DESTDIR)$(infodir)/gcc.info \
          $(DESTDIR)$(infodir)/cppinternals.info \
          $(DESTDIR)$(infodir)/gccint.info
          ^^^^^^^^^^^^^^^^^^^^

This has been breaking my builds for a while now (with errors along the
lines of "no rule to make /path/to/install/info/cpp.info").

<paranoia>Is it just me?  Am I doing something wrong?  I've been sitting
on this for a while now in the hope that someone more competent at Makefile
stuff would pick it up.

Anyway, I've used this patch successfully for several builds, including
mipsisa64-elf, mips64-elf, etc.  None involved ada or treelang, they're
just included by extension.  OK to install?

Richard


	* Makefile.in (install-info): Depend on the generated .info files,
	not the installed ones.
	* ada/Make-lang.in (install-info): Likewise.
	* f/Make-lang.in (install-info): Likewise.
	* java/Make-lang.in (install-info): Likewise.
	* treelang/Make-lang.in (install-info): Likewise.

Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/Makefile.in,v
retrieving revision 1.1192
diff -u -d -p -F^\([(a-zA-Z0-9_]\|#define\) -r1.1192 Makefile.in
--- Makefile.in	4 Nov 2003 05:34:13 -0000	1.1192
+++ Makefile.in	5 Nov 2003 08:16:06 -0000
@@ -3001,10 +3001,10 @@ install-driver: installdirs xgcc$(exeext
 # $(INSTALL_DATA) might be a relative pathname, so we can't cd into srcdir
 # to do the install.
 install-info:: doc installdirs \
-	$(DESTDIR)$(infodir)/cpp.info \
-	$(DESTDIR)$(infodir)/gcc.info \
-	$(DESTDIR)$(infodir)/cppinternals.info \
-	$(DESTDIR)$(infodir)/gccint.info
+	$(docobjdir)/cpp.info \
+	$(docobjdir)/gcc.info \
+	$(docobjdir)/cppinternals.info \
+	$(docobjdir)/gccint.info
 
 $(DESTDIR)$(infodir)/%.info: $(docobjdir)/%.info installdirs
 	rm -f $@
Index: ada/Make-lang.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/Make-lang.in,v
retrieving revision 1.49
diff -u -d -p -F^\([(a-zA-Z0-9_]\|#define\) -r1.49 Make-lang.in
--- ada/Make-lang.in	4 Nov 2003 12:51:46 -0000	1.49
+++ ada/Make-lang.in	5 Nov 2003 08:16:06 -0000
@@ -499,12 +499,12 @@ info:: $(docobjdir)/gnat_ug_vms.info $(d
 	$(docobjdir)/gnat_ug_unx.info $(docobjdir)/gnat_ug_vxw.info \
 	$(docobjdir)/gnat_rm.info $(docobjdir)/gnat-style.info
 
-install-info:: $(DESTDIR)$(infodir)/gnat_ug_vms.info \
-	$(DESTDIR)$(infodir)/gnat_ug_wnt.info \
-	$(DESTDIR)$(infodir)/gnat_ug_unx.info \
-	$(DESTDIR)$(infodir)/gnat_ug_vxw.info \
-	$(DESTDIR)$(infodir)/gnat_rm.info \
-	$(DESTDIR)$(infodir)/gnat-style.info
+install-info:: $(docobjdir)/gnat_ug_vms.info \
+	$(docobjdir)/gnat_ug_wnt.info \
+	$(docobjdir)/gnat_ug_unx.info \
+	$(docobjdir)/gnat_ug_vxw.info \
+	$(docobjdir)/gnat_rm.info \
+	$(docobjdir)/gnat-style.info
 
 dvi:: $(docobjdir)/gnat_ug_vms.dvi $(docobjdir)/gnat_ug_wnt.dvi \
 	$(docobjdir)/gnat_ug_unx.dvi $(docobjdir)/gnat_ug_vxw.dvi \
Index: f/Make-lang.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/f/Make-lang.in,v
retrieving revision 1.132
diff -u -d -p -F^\([(a-zA-Z0-9_]\|#define\) -r1.132 Make-lang.in
--- f/Make-lang.in	4 Nov 2003 00:25:48 -0000	1.132
+++ f/Make-lang.in	5 Nov 2003 08:16:06 -0000
@@ -268,7 +268,7 @@ f77.install-common: installdirs
 	  echo ''; \
 	else true; fi
 
-install-info:: $(DESTDIR)$(infodir)/g77.info
+install-info:: $(docobjdir)/g77.info
 
 f77.install-man: $(GENERATED_MANPAGES) installdirs
 	-if [ -f f771$(exeext) ] ; then \
Index: java/Make-lang.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/java/Make-lang.in,v
retrieving revision 1.122
diff -u -d -p -F^\([(a-zA-Z0-9_]\|#define\) -r1.122 Make-lang.in
--- java/Make-lang.in	4 Nov 2003 00:25:48 -0000	1.122
+++ java/Make-lang.in	5 Nov 2003 08:16:06 -0000
@@ -211,7 +211,7 @@ java.uninstall:
 	-rm -rf $(DESTDIR)$(man1dir)/gij$(man1ext)
 	-rm -rf $(DESTDIR)$(man1dir)/jv-convert$(man1ext)
 
-install-info:: $(DESTDIR)$(infodir)/gcj.info
+install-info:: $(docobjdir)/gcj.info
 
 #
 # Clean hooks:
Index: treelang/Make-lang.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/treelang/Make-lang.in,v
retrieving revision 1.39
diff -u -d -p -F^\([(a-zA-Z0-9_]\|#define\) -r1.39 Make-lang.in
--- treelang/Make-lang.in	4 Nov 2003 00:25:49 -0000	1.39
+++ treelang/Make-lang.in	5 Nov 2003 08:16:06 -0000
@@ -194,7 +194,7 @@ treelang.install.common.done:  installdi
 	$(STAMP) treelang.install.common.done
 
 # We might not be able to build the info files
-install-info:: $(DESTDIR)$(infodir)/treelang.info
+install-info:: $(docobjdir)/treelang.info
 
 treelang.install-man:
 


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