re PR bootstrap/14893 (3.4.0-20040406, 'make install' fails on doc/gcjh.1)

2004-08-05  Michael Chastain  <mec.gnu@mindspring.com>

	PR bootstrap/14893
	* Make-lang.in (java.install-man): Install from either build
	tree or source tree, whichever has the file first.

(See the PR for more information and the approval from Alexandre Oliva.
 This fix has been in gcc-3_4-branch for about four months).

From-SVN: r85610

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index e2a768493c9b9d851fdccabf98402b03017b0ccd..23fe7b2daaf44e0f76ee7f703dcb301e6215de81 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,9 @@
+2004-08-05  Michael Chastain  <mec.gnu@mindspring.com>
+
+       PR bootstrap/14893
+       * Make-lang.in (java.install-man): Install from either build
+       tree or source tree, whichever has the file first.
+
 2004-08-05  Nathan Sidwell  <nathan@codesourcery.com>
 
        * jcf-parse.c (get_constant): Adjust force_fit_type call.

diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in
index 2944383eeb371fe607195dd92c913071418b78b9..afc22d8f2a1953e175d65b8604715ff385a1c234 100644 (file)
--- a/gcc/java/Make-lang.in
+++ b/gcc/java/Make-lang.in
@@ -407,7 +407,13 @@ java.install-man: installdirs \
          tool_transformed_name=`echo $$tool|sed '$(program_transform_name)'`; \
          man_name=$(DESTDIR)$(man1dir)/$${tool_transformed_name}$(man1ext); \
          rm -f $$man_name ; \
-         $(INSTALL_DATA) doc/$${tool}.1 $$man_name; \
+         for source_name in doc/$${tool}.1 $(srcdir)/doc/$${tool}.1 ; do \
+           if test -f $$source_name; then \
+             $(INSTALL_DATA) $$source_name $$man_name; \
+             break; \
+             else : ; \
+           fi; \
+         done ; \
          chmod a-x $$man_name ; \
        done