(patches, committed)

(patches, committed)

[Nathanael Nerode]

This is a heads-up; I've committed some patches to correct an 
ill-advised patch by HJL.  I know I should have got approval, but after 
the discussion with Alex and DJ, I decided these were obviously correct; 
the design is correct and the implementation consists of changing one 
directory name across the board.  Also, the existing situation was 
broken.

HJ did this:

	* Makefile.tpl: Add @build_prefix@ before $(BUILD_SUBDIR).
	* Makefile.in: Regenerated.

	* configure.in (build_prefix): New. Substitute.

This was poor form, since BUILD_PREFIX already exists as a *different* 
Makefile variable.  HJ also only set it when build_subdir would 
otherwise conflict with target_subdir, which was contrary to our 
conclusion that the prefix should always be added.  I replaced his 
patch with:

	* Makefile.tpl: Revert HJL's change.
	* Makefile.in: Regenerated.
	* configure.in: Put build_prefix before $(BUILD_SUBDIR) here, and
	always.

Now BUILD_SUBDIR is always set to build-$build_alias.  It still isn't 
created or used if build=host.

HJ also didn't do the corresponding change needed to get GCC to find the 
right copy of libiberty, which I committed:

	* configure.in: FORBUILD when build!=host changed from 
	../$build-alias to ../build-$build_alias to match change made
	in top directory.
	* configure: Regenerated.

Thankfully, I think no other subdir uses build subdirs at the moment, so 
there's nothing else to change.

Patches follow for informational purposes.
(toplevel configure.in and Makefile.tpl)
===================================================================
RCS file: /cvs/gcc/gcc/configure.in,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- gcc/configure.in	2002/12/19 11:01:21	1.195
+++ gcc/configure.in	2002/12/19 20:23:50	1.196
@@ -156,7 +156,8 @@
   fi
 fi

-build_subdir=${build_alias}
+build_prefix=build-
+build_subdir=${build_prefix}${build_alias}
 
 if test x"${build_alias}" != x"${host}" ; then
   if test ! -d ${build_subdir} ; then
@@ -168,10 +169,6 @@
   fi
 fi

-if test x"${target_subdir}" = x"${build_subdir}" ; then
-  build_prefix=build-
-fi
-
 # Skipdirs are removed silently.
 skipdirs=
 # Noconfigdirs are removed loudly.
@@ -1733,7 +1730,6 @@
 s%@RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@%\$(STAGE_CC_WRAPPER) 
${qqRAW_CXX_FOR_TARGET}%
 s%@target_subdir@%${target_subdir}%
 s%@build_subdir@%${build_subdir}%
-s%@build_prefix@%${build_prefix}%
 s%@build_configargs@%${buildargs}%
 s%@gxx_include_dir@%${gxx_include_dir}%
 s%@libstdcxx_incdir@%${libstdcxx_incdir}%
===================================================================
RCS file: /cvs/gcc/gcc/Makefile.tpl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gcc/Makefile.tpl	2002/12/19 11:01:20	1.20
+++ gcc/Makefile.tpl	2002/12/19 20:23:50	1.21
@@ -792,7 +792,7 @@
 .PHONY: configure-build-[+module+] maybe-configure-build-[+module+]
 maybe-configure-build-[+module+]:
 configure-build-[+module+]: $(BUILD_SUBDIR)/[+module+]/Makefile
-@build_prefix@$(BUILD_SUBDIR)/[+module+]/Makefile: config.status
+$(BUILD_SUBDIR)/[+module+]/Makefile: config.status
 	@[ -d $(BUILD_SUBDIR)/[+module+] ] || mkdir 
$(BUILD_SUBDIR)/[+module+];\
 	    r=`${PWD}`; export r; \
 	    s=`cd $(srcdir); ${PWD}`; export s; \

(gcc's configure.in)
===================================================================
RCS file: /cvs/gcc/gcc/gcc/configure.in,v
retrieving revision 1.628
retrieving revision 1.629
diff -u -r1.628 -r1.629
--- gcc/gcc/configure.in	2002/12/16 18:19:13	1.628
+++ gcc/gcc/configure.in	2002/12/19 21:44:29	1.629
@@ -998,7 +998,7 @@
 	cd ..
 	rm -rf $tempdir
 	build_auto=auto-build.h
-	FORBUILD=../$build_alias
+	FORBUILD=../build-$build_alias
 fi
 AC_SUBST(FORBUILD)