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]

Looking at the end of PR10996 [2/4] (f77 changes)


g77.1 was still being put in the source directory.  This changes it to
honor $(objdocdir).

It also does a 's/$(srcdir)\/doc/$(docdir)/' to match the other
Make-lang.in files.

Bootstrapped i686-pc-cygwin.
Also checked with make install-man which does correctly install the
g77.1 file (as well as the other man pages).

OK to install?

Kelley Cook






2003-10-21  Kelley Cook  <kcook@gcc.gnu.org>

	* Make-lang.in (f/g77.1): Honor $(docobjdir).
	($(docobjdir)/g77.info): Replace $(srcdir)/doc with $(docdir).
	(f/g77.dvi): Likewise.

--- Make-lang.in.orig	2003-10-21 14:08:31.302404800 -0400
+++ Make-lang.in	2003-10-21 14:10:41.509633600 -0400
@@ -150,16 +150,16 @@
 
 info:: $(docobjdir)/g77.info
 dvi:: f/g77.dvi
-generated-manpages:: $(srcdir)/f/g77.1
+generated-manpages:: $(docobjdir)/g77.1
 
 # g77 documentation.
 $(docobjdir)/g77.info: $(srcdir)/f/g77.texi $(srcdir)/f/bugs.texi \
 		$(srcdir)/f/ffe.texi $(srcdir)/f/invoke.texi \
 		$(srcdir)/f/news.texi  $(srcdir)/f/intdoc.texi \
-		$(srcdir)/f/root.texi $(srcdir)/doc/include/fdl.texi \
-		$(srcdir)/doc/include/gpl.texi \
-		$(srcdir)/doc/include/funding.texi \
-		$(srcdir)/doc/include/gcc-common.texi \
+		$(srcdir)/f/root.texi $(docdir)/include/fdl.texi \
+		$(docdir)/include/gpl.texi \
+		$(docdir)/include/funding.texi \
+		$(docdir)/include/gcc-common.texi \
 		stmp-docobjdir
 	if [ x$(BUILD_INFO) = xinfo ]; then \
 	  rm -f $(@)*; \
@@ -169,17 +169,17 @@
 f/g77.dvi: $(srcdir)/f/g77.texi $(srcdir)/f/bugs.texi \
 		$(srcdir)/f/ffe.texi $(srcdir)/f/invoke.texi \
 		$(srcdir)/f/news.texi  $(srcdir)/f/intdoc.texi \
-		$(srcdir)/f/root.texi $(srcdir)/doc/include/fdl.texi \
-		$(srcdir)/doc/include/gpl.texi \
-		$(srcdir)/doc/include/funding.texi \
-		$(srcdir)/doc/include/gcc-common.texi
+		$(srcdir)/f/root.texi $(docdir)/include/fdl.texi \
+		$(docdir)/include/gpl.texi \
+		$(docdir)/include/funding.texi \
+		$(docdir)/include/gcc-common.texi
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	cd f && $(TEXI2DVI) -I $$s/doc/include $$s/f/g77.texi
 
-$(srcdir)/f/g77.1: $(srcdir)/f/invoke.texi
+$(docobjdir)/g77.1: $(srcdir)/f/invoke.texi
 	-$(TEXI2POD) < $(srcdir)/f/invoke.texi > f/g77.pod; \
 	($(POD2MAN) --section=1 f/g77.pod > f/g77.1.T$$$$ && \
-	    mv -f f/g77.1.T$$$$ $(srcdir)/f/g77.1) || \
+	    mv -f f/g77.1.T$$$$ $(docobjdir)/g77.1) || \
 	    (rm -f f/g77.1.T$$$$ && exit 1); \
 	rm -f f/g77.pod; \
 
@@ -277,11 +277,11 @@
 	-if [ -f f771$(exeext) ] ; then \
 	  if [ -f g77-cross$(exeext) ] ; then \
 	    rm -f $(DESTDIR)$(man1dir)/$(G77_CROSS_NAME)$(man1ext); \
-	    $(INSTALL_DATA) $(srcdir)/f/g77.1 $(DESTDIR)$(man1dir)/$(G77_CROSS_NAME)$(man1ext); \
+	    $(INSTALL_DATA) $(docobjdir)/g77.1 $(DESTDIR)$(man1dir)/$(G77_CROSS_NAME)$(man1ext); \
 	    chmod a-x $(DESTDIR)$(man1dir)/$(G77_CROSS_NAME)$(man1ext); \
 	  else \
 	    rm -f $(DESTDIR)$(man1dir)/$(G77_INSTALL_NAME)$(man1ext); \
-	    $(INSTALL_DATA) $(srcdir)/f/g77.1 $(DESTDIR)$(man1dir)/$(G77_INSTALL_NAME)$(man1ext); \
+	    $(INSTALL_DATA) $(docobjdir)/g77.1 $(DESTDIR)$(man1dir)/$(G77_INSTALL_NAME)$(man1ext); \
 	    chmod a-x $(DESTDIR)$(man1dir)/$(G77_INSTALL_NAME)$(man1ext); \
 	  fi; \
 	else true; fi



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