PATCH: needed changes to makefiles' FLAGS_TO_PASS

[Pieter Nagel]

1) This patch modifies the makefiles so that gxx_include_dir and local_prefix
are passed to sub-makes.

This is usefull for building binary packages (i.e. RPM) of egcs. It
allows one to do:

"make install prefix=/tmp/egcs gxx_include_dir=/tmp/egcs/usr/include/g++"

and thereby install egcs into a scratch directory, which makes it
easier to collect the binaries into one package without omitting
anything.

I noticed the problem when I tried to build the EGCS RPM from Elliot
Lee. Half of egcs is installed into /tmp/egcs and rolled into the
RPM, but libg++ headers go to /usr/include/g++ on the package builder's
machine. The result: libg++ would be missing from the RPM installer's
computer.

I can't see any problem with this patch: egcs already allows
overriding "prefix", the omission of the others seems illogical.

--------------------------------------------------------------------------------
diff -cr egcs-971225.orig/Makefile.in egcs-971225/Makefile.in
*** egcs-971225.orig/Makefile.in	Tue Dec  2 19:53:36 1997
--- egcs-971225/Makefile.in	Mon Dec 29 13:51:50 1997
***************
*** 329,334 ****
--- 329,335 ----
  	"CXXFLAGS_FOR_TARGET=$(CXXFLAGS_FOR_TARGET)" \
  	"CXX_FOR_TARGET=$(CXX_FOR_TARGET)" \
  	"DLLTOOL_FOR_TARGET=$(DLLTOOL_FOR_TARGET)" \
+ 	"gxx_include_dir=$(gxx_include_dir)" \
  	"INSTALL=$(INSTALL)" \
  	"INSTALL_DATA=$(INSTALL_DATA)" \
  	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
***************
*** 340,345 ****
--- 341,347 ----
  	"LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \
  	"LIBCXXFLAGS=$(LIBCXXFLAGS)" \
  	"LIBCXXFLAGS_FOR_TARGET=$(LIBCXXFLAGS_FOR_TARGET)" \
+ 	"local_prefix=$(local_prefix)" \
  	"M4=$(M4)" \
  	"MAKE=$(MAKE)" \
  	"MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \
Only in egcs-971225.orig/: Makefiles~
diff -cr egcs-971225.orig/gcc/Makefile.in egcs-971225/gcc/Makefile.in
*** egcs-971225.orig/gcc/Makefile.in	Thu Dec 25 01:55:56 1997
--- egcs-971225/gcc/Makefile.in	Mon Dec 29 13:52:14 1997
***************
*** 562,567 ****
--- 562,569 ----
  	"objext=$(objext)" \
  	"exec_prefix=$(exec_prefix)" \
  	"prefix=$(prefix)" \
+ 	"local_prefix=$(local_prefix)" \
+ 	"gxx_include_dir=$(gxx_include_dir)" \
  	"tooldir=$(tooldir)" \
  	"bindir=$(bindir)" \
  	"libsubdir=$(libsubdir)"
diff -cr egcs-971225.orig/gcc/f/Makefile.in egcs-971225/gcc/f/Makefile.in
*** egcs-971225.orig/gcc/f/Makefile.in	Sun Sep 14 22:03:52 1997
--- egcs-971225/gcc/f/Makefile.in	Mon Dec 29 13:52:20 1997
***************
*** 196,201 ****
--- 196,203 ----
  	"SHELL=$(SHELL)" \
  	"exec_prefix=$(exec_prefix)" \
  	"prefix=$(prefix)" \
+ 	"local_prefix=$(local_prefix)" \
+ 	"gxx_include_dir=$(gxx_include_dir)" \
  	"tooldir=$(tooldir)" \
  	"bindir=$(bindir)" \
  	"libsubdir=$(libsubdir)"


-- 
     ,_
     /_)              /| /
    /   i e t e r    / |/ a g e l