* Makefile.in (build_canonical, host_canonical): Let configure

        substitute values for these variables.
        * configure.in: Substitute for build_canonical, host_canonical
        and target_subdir in generated Makefile.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@19827 138bc75d-0d04-0410-961f-82ee72b054a4

4 files changed, 35 insertions, 0 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c96e8c2adc8..94d3c2c93a4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
 Mon May 18 01:23:33 1998  Jeffrey A Law  (law@cygnus.com)
 
+	* Makefile.in (build_canonical, host_canonical): Let configure
+	substitute values for these variables.
+	* configure.in: Substitute for build_canonical, host_canonical
+	and target_subdir in generated Makefile.
+
 	* output.h (find_basic_blocks): Declare.
 	(free_basic_block_vars, set_block_num, life_analysis): Likewise.
 
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 88b0202aecd..029ed142f4b 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -170,6 +170,9 @@ ENQUIRE_LDFLAGS = $(LDFLAGS)
 program_transform_name = @program_transform_name@
 program_transform_cross_name = s,^,$(target_alias)-,
 
+build_canonical = @build_canonical@
+host_canonical = @host_canonical@
+
 # Tools to use when building a cross-compiler.
 # These are used because `configure' appends `cross-make'
 # to the makefile when making a cross-compiler.
diff --git a/gcc/configure b/gcc/configure
index 37b499cf425..c88ad6e78c8 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -5212,6 +5212,18 @@ if [ ! -f Makefile.in ]; then
 	echo "source ${srcdir}/.gdbinit" >> .gdbinit
 fi
 
+# Define variables host_canonical and build_canonical
+# because some Cygnus local changes in the Makefile depend on them.
+build_canonical=${build}
+host_canonical=${host}
+target_subdir=
+if [ "${host}" != "${target}" ] ; then
+    target_subdir=${target}/
+fi
+
+
+
+	
 # If this is using newlib, then define inhibit_libc in
 # LIBGCC2_CFLAGS.  This will cause __eprintf to be left out of
 # libgcc.a, but that's OK because newib should have its own version of
@@ -5497,6 +5509,9 @@ s%@doprint@%$doprint%g
 s%@manext@%$manext%g
 s%@objext@%$objext%g
 s%@gthread_flags@%$gthread_flags%g
+s%@build_canonical@%$build_canonical%g
+s%@host_canonical@%$host_canonical%g
+s%@target_subdir@%$target_subdir%g
 s%@inhibit_libc@%$inhibit_libc%g
 s%@sched_prefix@%$sched_prefix%g
 s%@sched_cflags@%$sched_cflags%g
diff --git a/gcc/configure.in b/gcc/configure.in
index d8bc744e634..0ee19c4b545 100644
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -3368,6 +3368,18 @@ if [[ ! -f Makefile.in ]]; then
 	echo "source ${srcdir}/.gdbinit" >> .gdbinit
 fi
 
+# Define variables host_canonical and build_canonical
+# because some Cygnus local changes in the Makefile depend on them.
+build_canonical=${build}
+host_canonical=${host}
+target_subdir=
+if [[ "${host}" != "${target}" ]] ; then
+    target_subdir=${target}/
+fi
+AC_SUBST(build_canonical)
+AC_SUBST(host_canonical)
+AC_SUBST(target_subdir)
+	
 # If this is using newlib, then define inhibit_libc in
 # LIBGCC2_CFLAGS.  This will cause __eprintf to be left out of
 # libgcc.a, but that's OK because newib should have its own version of