diff options
| author | chastain <chastain@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-08-05 19:29:09 +0000 |
|---|---|---|
| committer | chastain <chastain@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-08-05 19:29:09 +0000 |
| commit | 3e0067928dd0e5967801bc9d18e039e31948566b (patch) | |
| tree | c72d020bfbc59a2c93b773f151e7f1ff418a5aba /gcc/java | |
| parent | 03dc92dbf4b2c2c55e610247baa43712ce1aede3 (diff) | |
| download | gcc-3e0067928dd0e5967801bc9d18e039e31948566b.tar.gz | |
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).
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@85610 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/java')
| -rw-r--r-- | gcc/java/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/java/Make-lang.in | 8 |
2 files changed, 13 insertions, 1 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index e2a768493c9..23fe7b2daaf 100644 --- 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 2944383eeb3..afc22d8f2a1 100644 --- 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 |