diff options
| author | chastain <chastain@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-04-14 19:45:18 +0000 |
|---|---|---|
| committer | chastain <chastain@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-04-14 19:45:18 +0000 |
| commit | 6b6a32fe7cc0a4be838b57274cdf566aff3efdde (patch) | |
| tree | 8c89e6f9c6806ad68968b190360e00f9ec62458e /gcc | |
| parent | 3403eab1c41e44c641f8f40b471a3ba4505ec012 (diff) | |
2004-04-12 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-3_4-branch@80688 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/java/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/java/Make-lang.in | 10 |
2 files changed, 14 insertions, 2 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 830aeb206da..783de546bcc 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,9 @@ +2004-04-12 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-03-23 Tom Tromey <tromey@redhat.com> * gcj.texi (Extensions): Document GCJ_PROPERTIES. diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in index 4e91eae0c99..2d59923afdd 100644 --- a/gcc/java/Make-lang.in +++ b/gcc/java/Make-lang.in @@ -1,6 +1,7 @@ # Top level -*- makefile -*- fragment for the GNU compiler for the Java(TM) # language. -# Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +# Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004 +# Free Software Foundation, Inc. #This file is part of GCC. @@ -401,7 +402,12 @@ 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; \ + fi; \ + done ; \ chmod a-x $$man_name ; \ done |