Makefile.in: Rename docdir to gcc_docdir.

gcc/

2006-03-30  Carlos O'Donell  <carlos@codesourcery.com>

	* Makefile.in: Rename docdir to gcc_docdir.

gcc/java/

2006-03-30  Carlos O'Donell  <carlos@codesourcery.com>

	* Make-lang.in: Rename docdir to gcc_docdir.

gcc/ada/

2006-03-29  Carlos O'Donell  <carlos@codesourcery.com>

	* Make-lang.in: Rename docdir to gcc_docdir.

gcc/fortran/

2006-03-29  Carlos O'Donell  <carlos@codesourcery.com>

	* Make-lang.in: Rename docdir to gcc_docdir.

gcc/treelang/

2006-03-29  Carlos O'Donell  <caros@codesourcery.com>

	* Make-lang.in: Rename docdir to gcc_docdir.

From-SVN: r112545

10 files changed, 50 insertions, 30 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d7410de..0ec4cac 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-30  Carlos O'Donell  <carlos@codesourcery.com>
+
+	* Makefile.in: Rename docdir to gcc_docdir.
+
 2006-03-30  Roger Sayle  <roger@eyesopen.com>
 
 	PR target/17959
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 094a850..c4304b2 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -72,7 +72,7 @@ program_transform_name := @program_transform_name@
 
 # Directory where sources are, from where we are.
 srcdir = @srcdir@
-docdir = @srcdir@/doc
+gcc_docdir = @srcdir@/doc
 
 # Directory where sources are, absolute.
 abs_srcdir = @abs_srcdir@
@@ -105,7 +105,7 @@ VPATH = @srcdir@
 # pattern rule for everything.
 # This vpath could be extended within the Make-lang fragments.
 
-vpath %.texi $(docdir):$(docdir)/include
+vpath %.texi $(gcc_docdir):$(gcc_docdir)/include
 
 # ----
 # Default values for variables overridden in Makefile fragments.
@@ -3367,15 +3367,15 @@ doc/cppinternals.info: $(TEXI_CPPINT_FILES)
 
 doc/%.info: %.texi
 	if [ x$(BUILD_INFO) = xinfo ]; then \
-		$(MAKEINFO) $(MAKEINFOFLAGS) -I . -I $(docdir) \
-			-I $(docdir)/include -o $@ $<; \
+		$(MAKEINFO) $(MAKEINFOFLAGS) -I . -I $(gcc_docdir) \
+			-I $(gcc_docdir)/include -o $@ $<; \
 	fi
 
 # Duplicate entry to handle renaming of gccinstall.info
 doc/gccinstall.info: $(TEXI_GCCINSTALL_FILES)
 	if [ x$(BUILD_INFO) = xinfo ]; then \
-		$(MAKEINFO) $(MAKEINFOFLAGS) -I $(docdir) \
-			-I $(docdir)/include -o $@ $<; \
+		$(MAKEINFO) $(MAKEINFOFLAGS) -I $(gcc_docdir) \
+			-I $(gcc_docdir)/include -o $@ $<; \
 	fi
 
 doc/cpp.dvi: $(TEXI_CPP_FILES)
@@ -3576,7 +3576,7 @@ maintainer-clean:
 	$(MAKE) lang.maintainer-clean distclean
 	-rm -f cpp.??s cpp.*aux
 	-rm -f gcc.??s gcc.*aux
-	-rm -f $(docdir)/*.info $(docdir)/*.1 $(docdir)/*.7 $(docdir)/*.dvi
+	-rm -f $(gcc_docdir)/*.info $(gcc_docdir)/*.1 $(gcc_docdir)/*.7 $(gcc_docdir)/*.dvi
 #
 # Entry points `install' and `uninstall'.
 # Also use `install-collect2' to install collect2 when the config files don't.
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 56e21e0..5081817 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-29  Carlos O'Donell  <carlos@codesourcery.com>
+
+	* Make-lang.in: Rename docdir to gcc_docdir.
+
 2006-03-04  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* gigi.h (get_ada_base_type): Delete.
diff --git a/gcc/ada/Make-lang.in b/gcc/ada/Make-lang.in
index d0e0d6f..5667afa 100644
--- a/gcc/ada/Make-lang.in
+++ b/gcc/ada/Make-lang.in
@@ -392,27 +392,27 @@ doc/gnat_ugn_unw.texi: $(srcdir)/ada/gnat_ugn.texi $(srcdir)/ada/ug_words
 	   $(srcdir)/ada/ug_words doc/gnat_ugn_unw.texi
 
 doc/gnat_ugn_unw.info: doc/gnat_ugn_unw.texi			\
-   $(docdir)/include/fdl.texi $(docdir)/include/gcc-common.texi	\
+   $(gcc_docdir)/include/fdl.texi $(gcc_docdir)/include/gcc-common.texi	\
    gcc-vers.texi
 
 	if [ x$(BUILD_INFO) = xinfo ]; then \
 	  rm -f $(@)*; \
-	  $(MAKEINFO) $(MAKEINFOFLAGS) -I$(docdir)/include \
+	  $(MAKEINFO) $(MAKEINFOFLAGS) -I$(gcc_docdir)/include \
             -I$(srcdir)/ada -o $@ $<; \
 	else true; fi
 
-doc/gnat_rm.info: ada/gnat_rm.texi $(docdir)/include/fdl.texi	\
-   $(docdir)/include/gcc-common.texi gcc-vers.texi
+doc/gnat_rm.info: ada/gnat_rm.texi $(gcc_docdir)/include/fdl.texi	\
+   $(gcc_docdir)/include/gcc-common.texi gcc-vers.texi
 	if [ x$(BUILD_INFO) = xinfo ]; then \
 	  rm -f $(@)*; \
-	  $(MAKEINFO) $(MAKEINFOFLAGS) -I$(docdir)/include \
+	  $(MAKEINFO) $(MAKEINFOFLAGS) -I$(gcc_docdir)/include \
             -I$(srcdir)/ada -o $@ $<; \
 	else true; fi
 
-doc/gnat-style.info: ada/gnat-style.texi $(docdir)/include/fdl.texi
+doc/gnat-style.info: ada/gnat-style.texi $(gcc_docdir)/include/fdl.texi
 	if [ x$(BUILD_INFO) = xinfo ]; then \
 	  rm -f $(@)*; \
-	  $(MAKEINFO) $(MAKEINFOFLAGS) -I$(docdir)/include \
+	  $(MAKEINFO) $(MAKEINFOFLAGS) -I$(gcc_docdir)/include \
             -I$(srcdir)/ada -o $@ $<; \
 	else true; fi
 
@@ -433,15 +433,15 @@ ada.dvi: doc/gnat_ugn_unw.dvi \
 
 ada.html:
 
-doc/gnat_ugn_unw.dvi: doc/gnat_ugn_unw.texi $(docdir)/include/fdl.texi	\
-	$(docdir)/include/gcc-common.texi gcc-vers.texi
+doc/gnat_ugn_unw.dvi: doc/gnat_ugn_unw.texi $(gcc_docdir)/include/fdl.texi	\
+	$(gcc_docdir)/include/gcc-common.texi gcc-vers.texi
 	$(TEXI2DVI) -c -I $(abs_docdir)/include -o $@ $<
 
-doc/gnat_rm.dvi: ada/gnat_rm.texi $(docdir)/include/fdl.texi	\
-	$(docdir)/include/gcc-common.texi gcc-vers.texi
+doc/gnat_rm.dvi: ada/gnat_rm.texi $(gcc_docdir)/include/fdl.texi	\
+	$(gcc_docdir)/include/gcc-common.texi gcc-vers.texi
 	$(TEXI2DVI) -c -I $(abs_docdir)/include -o $@ $<
 
-doc/gnat-style.dvi: ada/gnat-style.texi $(docdir)/include/fdl.texi
+doc/gnat-style.dvi: ada/gnat-style.texi $(gcc_docdir)/include/fdl.texi
 	$(TEXI2DVI) -c -I $(abs_docdir)/include -o $@ $<
 
 
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 8cc9ea2..379d687 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-29  Carlos O'Donell  <carlos@codesourcery.com>
+
+	* Make-lang.in: Rename docdir to gcc_docdir.
+
 2006-03-28  Steven G. Kargl  <kargls@comcast.net>
 
 	* intrinsic.texi: s/floor/float in previous commit.
diff --git a/gcc/fortran/Make-lang.in b/gcc/fortran/Make-lang.in
index a85926a..e9480bb 100644
--- a/gcc/fortran/Make-lang.in
+++ b/gcc/fortran/Make-lang.in
@@ -165,7 +165,7 @@ doc/gfortran.dvi: $(GFORTRAN_TEXI)
 $(htmldir)/gfortran/index.html: $(GFORTRAN_TEXI)
 	$(mkinstalldirs) $(@D)
 	rm -f $(@D)/*
-	$(TEXI2HTML) -I $(docdir)/include -I $(srcdir)/fortran -o $(@D) $<
+	$(TEXI2HTML) -I $(gcc_docdir)/include -I $(srcdir)/fortran -o $(@D) $<
 
 .INTERMEDIATE: gfortran.pod
 
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 64fea4a..6d705fb 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-30  Carlos O'Donell  <carlos@codesourcery.com>
+
+	* Make-lang.in: Rename docdir to gcc_docdir.
+
 2006-03-30  Tom Tromey  <tromey@redhat.com>
 
 	PR java/26042:
diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in
index 96ca2d2..c3393d2 100644
--- a/gcc/java/Make-lang.in
+++ b/gcc/java/Make-lang.in
@@ -380,15 +380,15 @@ java/gjavah-jni.o: $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(JAVA_TREE_H) \
 		-DJNI_DEFAULT=1 \
 		$(srcdir)/java/gjavah.c $(OUTPUT_OPTION)
 
-TEXI_JAVA_FILES = java/gcj.texi $(docdir)/include/fdl.texi		\
-	 $(docdir)/include/gpl.texi $(docdir)/include/gcc-common.texi   \
+TEXI_JAVA_FILES = java/gcj.texi $(gcc_docdir)/include/fdl.texi		\
+	 $(gcc_docdir)/include/gpl.texi $(gcc_docdir)/include/gcc-common.texi   \
 	 gcc-vers.texi
 
 # Documentation
 doc/gcj.info: $(TEXI_JAVA_FILES)
 	if test "x$(BUILD_INFO)" = xinfo; then \
 	  rm -f doc/gcj.info*; \
-	  $(MAKEINFO) $(MAKEINFOFLAGS) -I $(docdir)/include -o $@ $<; \
+	  $(MAKEINFO) $(MAKEINFOFLAGS) -I $(gcc_docdir)/include -o $@ $<; \
 	else true; fi
 
 doc/gcj.dvi: $(TEXI_JAVA_FILES)
@@ -397,7 +397,7 @@ doc/gcj.dvi: $(TEXI_JAVA_FILES)
 $(htmldir)/java/index.html: $(TEXI_JAVA_FILES)
 	$(mkinstalldirs) $(@D)
 	rm -f $(@D)/*
-	$(TEXI2HTML) -I $(docdir)/include -I $(srcdir)/java -o $(@D) $<
+	$(TEXI2HTML) -I $(gcc_docdir)/include -I $(srcdir)/java -o $(@D) $<
 
 .INTERMEDIATE: gcj.pod gcjh.pod jv-scan.pod jcf-dump.pod gij.pod \
   jv-convert.pod grmic.pod grmiregistry.pod gcj-dbtool.pod gjnih.pod
diff --git a/gcc/treelang/ChangeLog b/gcc/treelang/ChangeLog
index 318795f..3cd85d6 100644
--- a/gcc/treelang/ChangeLog
+++ b/gcc/treelang/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-29  Carlos O'Donell  <caros@codesourcery.com>
+
+	* Make-lang.in: Rename docdir to gcc_docdir.
+
 2006-02-20 Rafael Ávila de Espíndola <rafael.espindola@gmail.com>
 	* Make-lang.in (.phony): Remove TREELANG
 	(TREELANG): Remove
diff --git a/gcc/treelang/Make-lang.in b/gcc/treelang/Make-lang.in
index bd60336..53998de 100644
--- a/gcc/treelang/Make-lang.in
+++ b/gcc/treelang/Make-lang.in
@@ -161,14 +161,14 @@ treelang.srcinfo: doc/treelang.info
 treelang.dvi: doc/treelang.dvi
 
 TEXI_TREELANG_FILES = treelang/treelang.texi \
-	 $(docdir)/include/gcc-common.texi \
-	 $(docdir)/include/gpl.texi \
-	 $(docdir)/include/fdl.texi \
-	 $(docdir)/include/funding.texi \
+	 $(gcc_docdir)/include/gcc-common.texi \
+	 $(gcc_docdir)/include/gpl.texi \
+	 $(gcc_docdir)/include/fdl.texi \
+	 $(gcc_docdir)/include/funding.texi \
 	 gcc-vers.texi
 
 doc/treelang.info: $(TEXI_TREELANG_FILES)
-	$(MAKEINFO) $(MAKEINFOFLAGS) -I $(docdir)/include -o $@ $<
+	$(MAKEINFO) $(MAKEINFOFLAGS) -I $(gcc_docdir)/include -o $@ $<
 
 doc/treelang.dvi: $(TEXI_TREELANG_FILES)
 	$(TEXI2DVI) -I $(abs_docdir)/include -o $@ $<
@@ -178,7 +178,7 @@ treelang.html: $(htmldir)/treelang/index.html
 $(htmldir)/treelang/index.html: $(TEXI_TREELANG_FILES)
 	$(mkinstalldirs) $(@D)
 	rm -f $(@D)/*
-	$(TEXI2HTML) -I $(docdir)/include -I $(srcdir)/treelang -o $(@D) $<
+	$(TEXI2HTML) -I $(gcc_docdir)/include -I $(srcdir)/treelang -o $(@D) $<
 
 #
 # Install hooks: