diff options
| author | Zack Weinberg <zack@gcc.gnu.org> | 2005-03-21 17:50:19 +0000 |
|---|---|---|
| committer | Zack Weinberg <zack@gcc.gnu.org> | 2005-03-21 17:50:19 +0000 |
| commit | 90ee136828b4edb0e3cc00736c9b11213ee4bf85 (patch) | |
| tree | df976f44ca465117ed08cb1ff0c22fb46aa813f0 /fixincludes/Makefile.in | |
| parent | 140e859c6ca288c6c421db6dc04428755ccc066e (diff) | |
| download | gcc-90ee136828b4edb0e3cc00736c9b11213ee4bf85.tar.gz | |
Makefile.in: Set gcc_version directly, not via substitution.
* Makefile.in: Set gcc_version directly, not via substitution.
(libsubdir): Use $(gcc_version), not $(version).
(mkheaders.almost): New rule.
(mkheaders): Generate from mkheaders.almost.
(clean): Also delete mkheaders.almost.
* aclocal.m4: Do not include ../config/gcc-version.m4.
* configure.ac: Do not invoke TL_AC_GCC_VERSION. Generate
mkheaders.almost from mkheaders.in.
* configure: Regenerate.
From-SVN: r96819
Diffstat (limited to 'fixincludes/Makefile.in')
| -rw-r--r-- | fixincludes/Makefile.in | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/fixincludes/Makefile.in b/fixincludes/Makefile.in index 1383ef61b61..54382cc8021 100644 --- a/fixincludes/Makefile.in +++ b/fixincludes/Makefile.in @@ -49,10 +49,10 @@ target = @target@ target_noncanonical:=@target_noncanonical@ # The version of GCC in this tree -gcc_version=@gcc_version@ +gcc_version := $(shell cat $(srcdir)/../gcc/BASE-VER) # Directory in which the compiler finds libraries etc. -libsubdir = $(libdir)/gcc/$(target_noncanonical)/$(version) +libsubdir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version) # Directory in which the compiler finds executables libexecsubdir = $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version) # Where our executable files go @@ -130,7 +130,7 @@ mostlyclean : rm -f *.o *-stamp $(AF) $(FI) *~ fixinc.sh clean: mostlyclean - rm -f mkheaders + rm -f mkheaders mkheaders.almost distclean: clean rm -f Makefile config.h config.log config.status stamp-h @@ -143,8 +143,13 @@ distclean : clean Makefile: $(srcdir)/Makefile.in config.status $(SHELL) ./config.status Makefile -mkheaders: $(srcdir)/mkheaders.in config.status - CONFIG_FILES=mkheaders CONFIG_HEADERS= ./config.status +mkheaders.almost: $(srcdir)/mkheaders.in config.status + CONFIG_FILES=mkheaders.almost:mkheaders.in \ + CONFIG_HEADERS= ./config.status + +mkheaders: mkheaders.almost $(srcdir)/../gcc/BASE-VER + sed -e 's/@gcc_version@/$(gcc_version)/' < $< > $@T + mv -f $@T $@ config.h: stamp-h stamp-h: $(srcdir)/config.h.in config.status |