Commit ad3a7ce3 by Carlos O'Donell

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
parent 79edfde8
2006-03-30 Carlos O'Donell <carlos@codesourcery.com>
* Makefile.in: Rename docdir to gcc_docdir.
2006-03-30 Roger Sayle <roger@eyesopen.com> 2006-03-30 Roger Sayle <roger@eyesopen.com>
PR target/17959 PR target/17959
......
...@@ -72,7 +72,7 @@ program_transform_name := @program_transform_name@ ...@@ -72,7 +72,7 @@ program_transform_name := @program_transform_name@
# Directory where sources are, from where we are. # Directory where sources are, from where we are.
srcdir = @srcdir@ srcdir = @srcdir@
docdir = @srcdir@/doc gcc_docdir = @srcdir@/doc
# Directory where sources are, absolute. # Directory where sources are, absolute.
abs_srcdir = @abs_srcdir@ abs_srcdir = @abs_srcdir@
...@@ -105,7 +105,7 @@ VPATH = @srcdir@ ...@@ -105,7 +105,7 @@ VPATH = @srcdir@
# pattern rule for everything. # pattern rule for everything.
# This vpath could be extended within the Make-lang fragments. # 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. # Default values for variables overridden in Makefile fragments.
...@@ -3367,15 +3367,15 @@ doc/cppinternals.info: $(TEXI_CPPINT_FILES) ...@@ -3367,15 +3367,15 @@ doc/cppinternals.info: $(TEXI_CPPINT_FILES)
doc/%.info: %.texi doc/%.info: %.texi
if [ x$(BUILD_INFO) = xinfo ]; then \ if [ x$(BUILD_INFO) = xinfo ]; then \
$(MAKEINFO) $(MAKEINFOFLAGS) -I . -I $(docdir) \ $(MAKEINFO) $(MAKEINFOFLAGS) -I . -I $(gcc_docdir) \
-I $(docdir)/include -o $@ $<; \ -I $(gcc_docdir)/include -o $@ $<; \
fi fi
# Duplicate entry to handle renaming of gccinstall.info # Duplicate entry to handle renaming of gccinstall.info
doc/gccinstall.info: $(TEXI_GCCINSTALL_FILES) doc/gccinstall.info: $(TEXI_GCCINSTALL_FILES)
if [ x$(BUILD_INFO) = xinfo ]; then \ if [ x$(BUILD_INFO) = xinfo ]; then \
$(MAKEINFO) $(MAKEINFOFLAGS) -I $(docdir) \ $(MAKEINFO) $(MAKEINFOFLAGS) -I $(gcc_docdir) \
-I $(docdir)/include -o $@ $<; \ -I $(gcc_docdir)/include -o $@ $<; \
fi fi
doc/cpp.dvi: $(TEXI_CPP_FILES) doc/cpp.dvi: $(TEXI_CPP_FILES)
...@@ -3576,7 +3576,7 @@ maintainer-clean: ...@@ -3576,7 +3576,7 @@ maintainer-clean:
$(MAKE) lang.maintainer-clean distclean $(MAKE) lang.maintainer-clean distclean
-rm -f cpp.??s cpp.*aux -rm -f cpp.??s cpp.*aux
-rm -f gcc.??s gcc.*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'. # Entry points `install' and `uninstall'.
# Also use `install-collect2' to install collect2 when the config files don't. # Also use `install-collect2' to install collect2 when the config files don't.
......
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> 2006-03-04 Eric Botcazou <ebotcazou@adacore.com>
* gigi.h (get_ada_base_type): Delete. * gigi.h (get_ada_base_type): Delete.
......
...@@ -392,27 +392,27 @@ doc/gnat_ugn_unw.texi: $(srcdir)/ada/gnat_ugn.texi $(srcdir)/ada/ug_words ...@@ -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 $(srcdir)/ada/ug_words doc/gnat_ugn_unw.texi
doc/gnat_ugn_unw.info: 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 gcc-vers.texi
if [ x$(BUILD_INFO) = xinfo ]; then \ if [ x$(BUILD_INFO) = xinfo ]; then \
rm -f $(@)*; \ rm -f $(@)*; \
$(MAKEINFO) $(MAKEINFOFLAGS) -I$(docdir)/include \ $(MAKEINFO) $(MAKEINFOFLAGS) -I$(gcc_docdir)/include \
-I$(srcdir)/ada -o $@ $<; \ -I$(srcdir)/ada -o $@ $<; \
else true; fi else true; fi
doc/gnat_rm.info: ada/gnat_rm.texi $(docdir)/include/fdl.texi \ doc/gnat_rm.info: ada/gnat_rm.texi $(gcc_docdir)/include/fdl.texi \
$(docdir)/include/gcc-common.texi gcc-vers.texi $(gcc_docdir)/include/gcc-common.texi gcc-vers.texi
if [ x$(BUILD_INFO) = xinfo ]; then \ if [ x$(BUILD_INFO) = xinfo ]; then \
rm -f $(@)*; \ rm -f $(@)*; \
$(MAKEINFO) $(MAKEINFOFLAGS) -I$(docdir)/include \ $(MAKEINFO) $(MAKEINFOFLAGS) -I$(gcc_docdir)/include \
-I$(srcdir)/ada -o $@ $<; \ -I$(srcdir)/ada -o $@ $<; \
else true; fi 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 \ if [ x$(BUILD_INFO) = xinfo ]; then \
rm -f $(@)*; \ rm -f $(@)*; \
$(MAKEINFO) $(MAKEINFOFLAGS) -I$(docdir)/include \ $(MAKEINFO) $(MAKEINFOFLAGS) -I$(gcc_docdir)/include \
-I$(srcdir)/ada -o $@ $<; \ -I$(srcdir)/ada -o $@ $<; \
else true; fi else true; fi
...@@ -433,15 +433,15 @@ ada.dvi: doc/gnat_ugn_unw.dvi \ ...@@ -433,15 +433,15 @@ ada.dvi: doc/gnat_ugn_unw.dvi \
ada.html: ada.html:
doc/gnat_ugn_unw.dvi: doc/gnat_ugn_unw.texi $(docdir)/include/fdl.texi \ doc/gnat_ugn_unw.dvi: doc/gnat_ugn_unw.texi $(gcc_docdir)/include/fdl.texi \
$(docdir)/include/gcc-common.texi gcc-vers.texi $(gcc_docdir)/include/gcc-common.texi gcc-vers.texi
$(TEXI2DVI) -c -I $(abs_docdir)/include -o $@ $< $(TEXI2DVI) -c -I $(abs_docdir)/include -o $@ $<
doc/gnat_rm.dvi: ada/gnat_rm.texi $(docdir)/include/fdl.texi \ doc/gnat_rm.dvi: ada/gnat_rm.texi $(gcc_docdir)/include/fdl.texi \
$(docdir)/include/gcc-common.texi gcc-vers.texi $(gcc_docdir)/include/gcc-common.texi gcc-vers.texi
$(TEXI2DVI) -c -I $(abs_docdir)/include -o $@ $< $(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 $@ $< $(TEXI2DVI) -c -I $(abs_docdir)/include -o $@ $<
......
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> 2006-03-28 Steven G. Kargl <kargls@comcast.net>
* intrinsic.texi: s/floor/float in previous commit. * intrinsic.texi: s/floor/float in previous commit.
......
...@@ -165,7 +165,7 @@ doc/gfortran.dvi: $(GFORTRAN_TEXI) ...@@ -165,7 +165,7 @@ doc/gfortran.dvi: $(GFORTRAN_TEXI)
$(htmldir)/gfortran/index.html: $(GFORTRAN_TEXI) $(htmldir)/gfortran/index.html: $(GFORTRAN_TEXI)
$(mkinstalldirs) $(@D) $(mkinstalldirs) $(@D)
rm -f $(@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 .INTERMEDIATE: gfortran.pod
......
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> 2006-03-30 Tom Tromey <tromey@redhat.com>
PR java/26042: PR java/26042:
......
...@@ -380,15 +380,15 @@ java/gjavah-jni.o: $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(JAVA_TREE_H) \ ...@@ -380,15 +380,15 @@ java/gjavah-jni.o: $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(JAVA_TREE_H) \
-DJNI_DEFAULT=1 \ -DJNI_DEFAULT=1 \
$(srcdir)/java/gjavah.c $(OUTPUT_OPTION) $(srcdir)/java/gjavah.c $(OUTPUT_OPTION)
TEXI_JAVA_FILES = java/gcj.texi $(docdir)/include/fdl.texi \ TEXI_JAVA_FILES = java/gcj.texi $(gcc_docdir)/include/fdl.texi \
$(docdir)/include/gpl.texi $(docdir)/include/gcc-common.texi \ $(gcc_docdir)/include/gpl.texi $(gcc_docdir)/include/gcc-common.texi \
gcc-vers.texi gcc-vers.texi
# Documentation # Documentation
doc/gcj.info: $(TEXI_JAVA_FILES) doc/gcj.info: $(TEXI_JAVA_FILES)
if test "x$(BUILD_INFO)" = xinfo; then \ if test "x$(BUILD_INFO)" = xinfo; then \
rm -f doc/gcj.info*; \ rm -f doc/gcj.info*; \
$(MAKEINFO) $(MAKEINFOFLAGS) -I $(docdir)/include -o $@ $<; \ $(MAKEINFO) $(MAKEINFOFLAGS) -I $(gcc_docdir)/include -o $@ $<; \
else true; fi else true; fi
doc/gcj.dvi: $(TEXI_JAVA_FILES) doc/gcj.dvi: $(TEXI_JAVA_FILES)
...@@ -397,7 +397,7 @@ doc/gcj.dvi: $(TEXI_JAVA_FILES) ...@@ -397,7 +397,7 @@ doc/gcj.dvi: $(TEXI_JAVA_FILES)
$(htmldir)/java/index.html: $(TEXI_JAVA_FILES) $(htmldir)/java/index.html: $(TEXI_JAVA_FILES)
$(mkinstalldirs) $(@D) $(mkinstalldirs) $(@D)
rm -f $(@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 \ .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 jv-convert.pod grmic.pod grmiregistry.pod gcj-dbtool.pod gjnih.pod
......
2006-03-29 Carlos O'Donell <caros@codesourcery.com>
* Make-lang.in: Rename docdir to gcc_docdir.
2006-02-20 Rafael vila de Espndola <rafael.espindola@gmail.com> 2006-02-20 Rafael vila de Espndola <rafael.espindola@gmail.com>
* Make-lang.in (.phony): Remove TREELANG * Make-lang.in (.phony): Remove TREELANG
(TREELANG): Remove (TREELANG): Remove
......
...@@ -161,14 +161,14 @@ treelang.srcinfo: doc/treelang.info ...@@ -161,14 +161,14 @@ treelang.srcinfo: doc/treelang.info
treelang.dvi: doc/treelang.dvi treelang.dvi: doc/treelang.dvi
TEXI_TREELANG_FILES = treelang/treelang.texi \ TEXI_TREELANG_FILES = treelang/treelang.texi \
$(docdir)/include/gcc-common.texi \ $(gcc_docdir)/include/gcc-common.texi \
$(docdir)/include/gpl.texi \ $(gcc_docdir)/include/gpl.texi \
$(docdir)/include/fdl.texi \ $(gcc_docdir)/include/fdl.texi \
$(docdir)/include/funding.texi \ $(gcc_docdir)/include/funding.texi \
gcc-vers.texi gcc-vers.texi
doc/treelang.info: $(TEXI_TREELANG_FILES) 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) doc/treelang.dvi: $(TEXI_TREELANG_FILES)
$(TEXI2DVI) -I $(abs_docdir)/include -o $@ $< $(TEXI2DVI) -I $(abs_docdir)/include -o $@ $<
...@@ -178,7 +178,7 @@ treelang.html: $(htmldir)/treelang/index.html ...@@ -178,7 +178,7 @@ treelang.html: $(htmldir)/treelang/index.html
$(htmldir)/treelang/index.html: $(TEXI_TREELANG_FILES) $(htmldir)/treelang/index.html: $(TEXI_TREELANG_FILES)
$(mkinstalldirs) $(@D) $(mkinstalldirs) $(@D)
rm -f $(@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: # Install hooks:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment