Make fixinc/ work when autogen is not installed.

	* fixinc/Makefile.in (subdir): New.
	(fixincl.x, inclhack.sh, fixincl.sh): Use cp instead of $(CP).
	(Makefile): New.

From-SVN: r28986

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f234092ec6e6f48de3e0ec65c232e7faf4a15aa0..8e8453c174857b20a5e391d11ac5c7cc23d16e72 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+Mon Aug 30 12:23:53 1999  Jim Wilson  <wilson@cygnus.com>
+
+       * fixinc/Makefile.in (subdir): New.
+       (fixincl.x, inclhack.sh, fixincl.sh): Use cp instead of $(CP).
+       (Makefile): New.
+       
 Mon Aug 30 01:02:09 1999  Jeffrey A Law  (law@cygnus.com)
 
        * dwarf2out.c (mem_loc_descriptor): New argument MODE.  All callers

diff --git a/gcc/fixinc/Makefile.in b/gcc/fixinc/Makefile.in
index 9182337c76a04f43f3d06d70ed4a5e8087fef5b0..9821969f4e17ffc6602203c59b00ced7ddec4573 100644 (file)
--- a/gcc/fixinc/Makefile.in
+++ b/gcc/fixinc/Makefile.in
@@ -31,6 +31,7 @@ target=@target@
 # Directory where sources are, from where we are.
 srcdir = @srcdir@
 VPATH = @srcdir@
+subdir = fixinc
 
 # End of variables for you to override.
 
@@ -95,7 +96,7 @@ fixincl.x: fixincl.tpl inclhack.def
                        $(srcdir)/inclhack.def ; \
        else echo You need to install autogen ; \
                if [ `pwd` != `cd $(srcdir) ; pwd` ] ; then \
-                       $(CP) $(srcdir)/$@ . ; \
+                       cp $(srcdir)/$@ . ; \
                else touch $@ ; fi ; fi
 
 inclhack.sh: inclhack.def inclhack.tpl hackshell.tpl
@@ -104,7 +105,7 @@ inclhack.sh: inclhack.def inclhack.tpl hackshell.tpl
                autogen -L$(srcdir) $(srcdir)/inclhack.def ; \
        else echo You need to install autogen ; \
                if [ `pwd` != `cd $(srcdir) ; pwd` ] ; then \
-                       $(CP) $(srcdir)/$@ . ; \
+                       cp $(srcdir)/$@ . ; \
                else touch $@ ; fi ; fi
 
 fixincl.sh: inclhack.def inclhack.tpl
@@ -114,7 +115,7 @@ fixincl.sh: inclhack.def inclhack.tpl
                        $(srcdir)/inclhack.def ; touch $@ ; \
        else echo You need to install autogen ; \
                if [ `pwd` != `cd $(srcdir) ; pwd` ] ; then \
-                       $(CP) $(srcdir)/$@ . ; \
+                       cp $(srcdir)/$@ . ; \
                else touch $@ ; fi ; fi
 
 clean:
@@ -145,3 +146,7 @@ install: $(TARGETS)
                then cp inclhack.sh ../fixinc.sh ; \
                else cp $(srcdir)/inclhack.sh ../fixinc.sh ; fi ; \
        fi
+
+Makefile: Makefile.in ../config.status
+       cd .. \
+         && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status