[Bug bootstrap/14893] [3.4 Regression] 3.4.0-20040406, 'make install' fails on doc/gcjh.1

["mec dot gnu at mindspring dot com" <gcc-bugzilla@gcc.gnu.org>]

------- Additional Comments From mec dot gnu at mindspring dot com  2004-04-13 19:51 -------
Subject: Re:  [3.4 Regression] 3.4.0-20040406, 'make install' fails on doc/gcjh.1

Okay, here's a patch to do what Alexander Oliva suggests.  I like this
better because the patch is much shorter.

I feel a bit caught in the middle here about the right approach to take.
I know we're trying to get 3.4.0 out but I'm getting up to speed here
as a contributor.

I tested this on:

  native i686-pc-linux-gnu, gnu make 3.79.1, 3.4.0-20040406
  native i686-pc-linux-gnu, gnu make 3.79.1, gcc gcc-3_4-branch
  native i686-pc-linux-gnu, gnu make 3.79.1, gcc HEAD

Alexander O: will you approve this for mainline?

Mark M: will you approve this for gcc-3_4-branch?

Michael C

2004-04-12  Michael Chastain  <mec.gnu@mindspring.com>

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

Index: Make-lang.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/java/Make-lang.in,v
retrieving revision 1.128.2.5
diff -c -3 -p -r1.128.2.5 Make-lang.in
*** Make-lang.in	22 Feb 2004 20:46:00 -0000	1.128.2.5
--- Make-lang.in	13 Apr 2004 01:31:08 -0000
***************
*** 1,6 ****
  # 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.
  
  #This file is part of GCC.
  
--- 1,7 ----
  # Top level -*- makefile -*- fragment for the GNU compiler for the Java(TM)
  # language.
! #   Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004
! #   Free Software Foundation, Inc.
  
  #This file is part of GCC.
  
*************** java.install-man: installdirs \
*** 401,407 ****
  	  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; \
  	  chmod a-x $$man_name ; \
  	done
  
--- 402,413 ----
  	  tool_transformed_name=`echo $$tool|sed '$(program_transform_name)'`; \
  	  man_name=$(DESTDIR)$(man1dir)/$${tool_transformed_name}$(man1ext); \
  	  rm -f $$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
  


-- 


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=14893