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]

[makefile] PR/13820 [3.4 Regression] "make dvi" crashes when configuredfrom a relative source directory


As PR/13820 mentions "make dvi" bombs if you configure via a relative pathname -- at least it does with the texinfo 4.2 version that is on my system.

This was very easy to fix.

After the patch this test succeeded on i686-pc-cygwin:
../gcc-snapshot/configure --enable-languages=all,treelang
make configure-gcc
cd gcc
make info dvi

OK to install?
gcc/
2004-01-22  Kelley Cook  <kcook@gcc.gnu.org>

	* Makefile.in (abs_docdir, abs_srcdir): Define.
	(doc/%.dvi, doc/gccinstall.dvi): Use $(abs_docdir).

gcc/ada/
2004-01-22  Kelley Cook  <kcook@gcc.gnu.org>

	* Make-lang.in (doc/gnat_ug_unx.dvi): Use $(abs_docdir). 
	(doc/gnat_ug_vms.dvi, doc/gnat_ug_unx.dvi): Likewise.
	(doc/gnat_ug_unx.dvi, doc/gnat-style.dvi): Likewise.

gcc/f/
2004-01-22  Kelley Cook  <kcook@gcc.gnu.org>

	* Make-lang.in (doc/g77.dvi): Use $(abs_docdir). 

gcc/java/
2004-01-22  Kelley Cook  <kcook@gcc.gnu.org>

	* Make-lang.in (doc/gcj.dvi): Use $(abs_docdir). 

gcc/treelang/
2004-01-22  Kelley Cook  <kcook@gcc.gnu.org>

	* Make-lang.in (doc/treelang.dvi): Use $(abs_docdir). 

diff -updr -x '*.[ach*' gcc-orig/gcc/Makefile.in gcc-snapshot/gcc/Makefile.in
--- gcc-orig/gcc/Makefile.in	2004-01-20 23:01:04.000000000 -0500
+++ gcc-snapshot/gcc/Makefile.in	2004-01-22 16:18:54.755283600 -0500
@@ -71,7 +71,11 @@ program_transform_name := @program_trans
 
 # Directory where sources are, from where we are.
 srcdir = @srcdir@
-docdir = $(srcdir)/doc
+docdir = @srcdir@/doc
+
+# Directory where sources are, absolute.
+abs_srcdir = @abs_srcdir@
+abs_docdir = @abs_srcdir@/doc
 
 # Top build directory, relative to here.
 top_builddir = ..
@@ -2667,11 +2671,11 @@ dvi:: doc/gcc.dvi doc/gccint.dvi doc/gcc
       doc/cppinternals.dvi
 
 doc/%.dvi: %.texi
-	$(TEXI2DVI) -I $(docdir) -I $(docdir)/include -o $@ $<
+	$(TEXI2DVI) -I $(abs_docdir) -I $(abs_docdir)/include -o $@ $<
 
 # Duplicate entry to handle renaming of gccinstall.dvi
 doc/gccinstall.dvi: $(TEXI_GCCINSTALL_FILES)
-	$(TEXI2DVI) -I $(docdir) -I $(docdir)/include -o $@ $<
+	$(TEXI2DVI) -I $(abs_docdir) -I $(abs_docdir)/include -o $@ $<
 
 MANFILES = doc/gcov.1 doc/cpp.1 doc/gcc.1 doc/gfdl.7 doc/gpl.7 doc/fsf-funding.7
 
diff -updr -x '*.[ach*' gcc-orig/gcc/ada/Make-lang.in gcc-snapshot/gcc/ada/Make-lang.in
--- gcc-orig/gcc/ada/Make-lang.in	2004-01-20 23:01:16.000000000 -0500
+++ gcc-snapshot/gcc/ada/Make-lang.in	2004-01-22 16:20:22.106985800 -0500
@@ -550,26 +550,26 @@ dvi:: doc/gnat_ug_vms.dvi doc/gnat_ug_wn
 
 doc/gnat_ug_unx.dvi: $(srcdir)/ada/gnat_ug_unx.texi \
 	$(docdir)/include/fdl.texi $(docdir)/include/gcc-common.texi
-	$(TEXI2DVI) -c -I $(docdir)/include -o $@ $<
+	$(TEXI2DVI) -c -I $(abs_docdir)/include -o $@ $<
 
 doc/gnat_ug_vms.dvi: $(srcdir)/ada/gnat_ug_vms.texi \
 	$(docdir)/include/fdl.texi $(docdir)/include/gcc-common.texi
-	$(TEXI2DVI) -c -I $(docdir)/include -o $@ $<
+	$(TEXI2DVI) -c -I $(abs_docdir)/include -o $@ $<
 
 doc/gnat_ug_vxw.dvi: $(srcdir)/ada/gnat_ug_vxw.texi \
 	$(docdir)/include/fdl.texi $(docdir)/include/gcc-common.texi
-	$(TEXI2DVI) -c -I $(docdir)/include -o $@ $<
+	$(TEXI2DVI) -c -I $(abs_docdir)/include -o $@ $<
 
 doc/gnat_ug_wnt.dvi: $(srcdir)/ada/gnat_ug_wnt.texi \
 	$(docdir)/include/fdl.texi $(docdir)/include/gcc-common.texi
-	$(TEXI2DVI) -c -I $(docdir)/include -o $@ $<
+	$(TEXI2DVI) -c -I $(abs_docdir)/include -o $@ $<
 
 doc/gnat_rm.dvi: ada/gnat_rm.texi \
 	$(docdir)/include/fdl.texi $(docdir)/include/gcc-common.texi
-	$(TEXI2DVI) -c -I $(docdir)/include -o $@ $<
+	$(TEXI2DVI) -c -I $(abs_docdir)/include -o $@ $<
 
 doc/gnat-style.dvi: ada/gnat-style.texi $(docdir)/include/fdl.texi
-	$(TEXI2DVI) -c -I $(docdir)/include -o $@ $<
+	$(TEXI2DVI) -c -I $(abs_docdir)/include -o $@ $<
 
 
 # Install hooks:
diff -updr -x '*.[ach*' gcc-orig/gcc/f/Make-lang.in gcc-snapshot/gcc/f/Make-lang.in
--- gcc-orig/gcc/f/Make-lang.in	2004-01-20 23:01:23.000000000 -0500
+++ gcc-snapshot/gcc/f/Make-lang.in	2004-01-22 16:20:44.560840000 -0500
@@ -174,7 +174,7 @@ doc/g77.info: $(TEXI_G77_FILES)
 	else true; fi
 
 doc/g77.dvi: $(TEXI_G77_FILES)
-	$(TEXI2DVI) -I $(srcdir)/f -I $(docdir)/include -I $(objdir)/f -o $@ $<
+	$(TEXI2DVI) -I $(srcdir)/f -I $(abs_docdir)/include -I $(objdir)/f -o $@ $<
 
 .INTERMEDIATE: g77.pod
 g77.pod: f/invoke.texi
diff -updr -x '*.[ach*' gcc-orig/gcc/java/Make-lang.in gcc-snapshot/gcc/java/Make-lang.in
--- gcc-orig/gcc/java/Make-lang.in	2004-01-20 23:01:24.000000000 -0500
+++ gcc-snapshot/gcc/java/Make-lang.in	2004-01-22 16:21:09.498439000 -0500
@@ -371,7 +371,7 @@ doc/gcj.info: java/gcj.texi $(docdir)/in
 
 doc/gcj.dvi: java/gcj.texi $(docdir)/include/fdl.texi \
 	 $(docdir)/include/gpl.texi $(docdir)/include/gcc-common.texi
-	$(TEXI2DVI) -I $(docdir)/include -o $@ $<
+	$(TEXI2DVI) -I $(abs_docdir)/include -o $@ $<
 
 .INTERMEDIATE: gcj.pod gcjh.pod jv-scan.pod jcf-dump.pod gij.pod \
   jv-convert.pod rmic.pod rmiregistry.pod
diff -updr -x '*.[ach*' gcc-orig/gcc/treelang/Make-lang.in gcc-snapshot/gcc/treelang/Make-lang.in
--- gcc-orig/gcc/treelang/Make-lang.in	2004-01-20 23:01:25.000000000 -0500
+++ gcc-snapshot/gcc/treelang/Make-lang.in	2004-01-22 16:21:28.306796800 -0500
@@ -161,7 +161,7 @@ doc/treelang.info: treelang/treelang.tex
 doc/treelang.dvi: treelang/treelang.texi $(docdir)/include/gcc-common.texi \
 	 $(docdir)/include/gpl.texi $(docdir)/include/fdl.texi \
 	 $(docdir)/include/funding.texi
-	$(TEXI2DVI) -I $(docdir)/include -o $@ $<
+	$(TEXI2DVI) -I $(abs_docdir)/include -o $@ $<
 
 #
 # Install hooks:

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