aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Wilson <wilson@cygnus.com>1999-08-30 19:27:15 +0000
committerJim Wilson <wilson@gcc.gnu.org>1999-08-30 12:27:15 -0700
commit3f5cd61f623e0e8df2668004adf7bc4570971b1c (patch)
tree52dda42dd27e00838e02a0dedadb02195e8ca71d
parent829297e618e031e9cd6f96c9f33b0768f98b4c3d (diff)
downloadgcc-3f5cd61f623e0e8df2668004adf7bc4570971b1c.zip
gcc-3f5cd61f623e0e8df2668004adf7bc4570971b1c.tar.gz
gcc-3f5cd61f623e0e8df2668004adf7bc4570971b1c.tar.bz2
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
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/fixinc/Makefile.in11
2 files changed, 14 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f234092..8e8453c 100644
--- 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 9182337..9821969 100644
--- 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