Index: ChangeLog

2004-11-04  Geoffrey Keating  <geoffk@apple.com>

	* Makefile.def: Build fixincludes for the host, too.
	* Makefile.in: Regenerate.
	* configure.in (host_tools): Add fixincludes.
	* configure: Regenerate.

Index: fixincludes/ChangeLog
2004-11-04  Geoffrey Keating  <geoffk@apple.com>

	* configure.ac: Add code to determine noncanonical_target,
	local_prefix, gcc_version; process mkheaders.in to make mkheaders.
	* configure: Regenerate.
	* fixinc.in: Move here from gcc/; fix many cross-hosting bugs.
	* mkfixinc.sh: Move here from gcc/; update for changes to fixinc.in.
	* mkheaders.in: Move here from gcc/; remove some unnecessary macros;
	update for changes to fixinc.in.
	* Makefile.in: Add many new macros.
	(install): New target.
	(mkheaders): New target.
	(fixinc.sh): New target.
	(all): Add mkheaders and fixinc.sh.
	* README-fixinc: Move here from gcc/.

Index: gcc/ChangeLog
2004-11-04  Geoffrey Keating  <geoffk@apple.com>

	* Makefile.in (distclean): Don't delete nonexistent fixinc/ directory.
	(install-mkheaders): Install the version built for the
	host, not for the build machine.
	* configure.ac: Always run fixincludes.
	(all_outputs): Remove mkheaders.
	* configure: Regenerate.
	* fixinc.in: Move to fixincludes/.
	* mkfixinc.sh: Likewise.
	* mkheaders.in: Likewise.
	* README-fixinc: Likewise.

From-SVN: r90117

1 files changed, 42 insertions, 1 deletions

diff --git a/fixincludes/Makefile.in b/fixincludes/Makefile.in
index c067d84a3cc..b2b6cc66be0 100644
--- a/fixincludes/Makefile.in
+++ b/fixincludes/Makefile.in
@@ -37,8 +37,32 @@ FIXINC_CFLAGS = -DHAVE_CONFIG_H $(INCLUDES)
 srcdir = @srcdir@
 VPATH = $(srcdir)
 
+# Directory in which to put the directories used by the compiler.
+libdir = @libdir@
+# Directory in which GCC puts its executables.
+libexecdir = @libexecdir@
+
 # End of variables for you to override.
 
+# The target that we're configured for.
+target = @target@
+target_noncanonical:=@target_noncanonical@
+
+# The version of GCC in this tree
+gcc_version=@gcc_version@
+
+# Directory in which the compiler finds libraries etc.
+libsubdir = $(libdir)/gcc/$(target_noncanonical)/$(version)
+# Directory in which the compiler finds executables
+libexecsubdir = $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version)
+# Where our executable files go
+itoolsdir = $(libexecsubdir)/install-tools
+# Where our data files go
+itoolsdatadir = $(libsubdir)/install-tools
+
+# Locate mkinstalldirs.
+mkinstalldirs=$(SHELL) $(srcdir)/../mkinstalldirs
+
 default : all
 
 # Now figure out from those variables how to compile and link.
@@ -70,7 +94,7 @@ HDR = server.h fixlib.h
 FI  = fixincl@EXEEXT@
 AF  = applyfix@EXEEXT@
 
-all : @TARGET@
+all : @TARGET@ fixinc.sh mkheaders
 gen : $(srcdir)/fixincl.x
 
 
@@ -96,6 +120,9 @@ server.o    : server.c
 procopen.o  : procopen.c
 fixlib.o    : fixlib.c
 
+fixinc.sh : fixinc.in mkfixinc.sh Makefile
+	srcdir="$(srcdir)" $(SHELL) $(srcdir)/mkfixinc.sh $(target)
+
 $(srcdir)/fixincl.x: @MAINT@ fixincl.tpl inclhack.def
 	cd $(srcdir) ; $(SHELL) ./genfixes
 
@@ -108,6 +135,9 @@ maintainer-clean : clean
 Makefile: $(srcdir)/Makefile.in config.status
 	$(SHELL) ./config.status Makefile
 
+mkheaders: $(srcdir)/mkheaders.in config.status
+	CONFIG_FILES=mkheaders CONFIG_HEADERS= ./config.status
+
 config.h: stamp-h
 stamp-h: $(srcdir)/config.h.in config.status
 	$(SHELL) ./config.status config.h
@@ -128,3 +158,14 @@ check : all
 	autogen -T $(srcdir)/check.tpl $(srcdir)/inclhack.def
 	$(SHELL) ./check.sh $(srcdir)/tests/base
 	@rm -f ./check.sh
+
+install : all
+	-rm -rf $(DESTDIR)$(itoolsdir)
+	$(mkinstalldirs) $(DESTDIR)$(itoolsdir) 
+	$(mkinstalldirs) $(DESTDIR)$(itoolsdatadir)/include
+	$(INSTALL_DATA) $(srcdir)/README-fixinc \
+	  $(DESTDIR)$(itoolsdatadir)/include/README
+	$(INSTALL_SCRIPT) fixinc.sh $(DESTDIR)$(itoolsdir)/fixinc.sh
+	$(INSTALL_PROGRAM) fixincl$(build_exeext) \
+	  $(DESTDIR)$(itoolsdir)/fixincl
+	$(INSTALL_SCRIPT) mkheaders $(DESTDIR)$(itoolsdir)/mkheaders