Makefile.in (target_noncanonical, [...]): Use immediate define instead of deferred.

gcc/
2004-01-16  Kelley Cook  <kcook@gcc.gnu.org>

	* Makefile.in (target_noncanonical, program_transform_name): Use
	immediate define instead of deferred.
	(GCC_INSTALL_NAME, GCC_TARGET_INSTALL_NAME, CPP_INSTALL_NAME,
	PROTOIZE_INSTALL_NAME, UNPROTOIZE_INSTALL_NAME, GCOV_INSTALL_NAME,
	GCCBUG_INSTALL_NAME): Define via a immediate $(shell) instead of
	deferred backquote.

gcc/cp
2004-01-16  Kelley Cook  <kcook@gcc.gnu.org>

	* Make-lang.in (CXX_INSTALL_NAME, GXX_INSTALL_NAME,
	CXX_TARGET_INSTALL_NAME, GXX_TARGET_INSTALL_NAME): Define via a
	immediate $(shell) instead of deferred backquote.

gcc/f
2004-01-16  Kelley Cook  <kcook@gcc.gnu.org>

	* Make-lang.in (G77_INSTALL_NAME): Define via a immediate $(shell)
	instead of deferred backquote.

gcc/java
2004-01-16  Kelley Cook  <kcook@gcc.gnu.org>

	* Make-lang.in (JAVA_INSTALL_NAME, JAVA_TARGET_INSTALL_NAME,
	GCJH_TARGET_INSTALL_NAME): Define via a immediate $(shell)
	instead of deferred backquote.

From-SVN: r76193

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c2a1a50..3b53c62 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2004-01-20  Kelley Cook  <kcook@gcc.gnu.org>
+
+       * Makefile.in (target_noncanonical, program_transform_name): Use 
+       immediate define instead of deferred.
+       (GCC_INSTALL_NAME, GCC_TARGET_INSTALL_NAME, CPP_INSTALL_NAME, 
+       PROTOIZE_INSTALL_NAME, UNPROTOIZE_INSTALL_NAME, GCOV_INSTALL_NAME,
+       GCCBUG_INSTALL_NAME): Define via a immediate $(shell) instead of
+       deferred backquote.
+
 2004-01-20  Joseph S. Myers  <jsm@polyomino.org.uk>
 
        * c-decl.c (c_init_decl_processing): Set pedantic_lvalues to

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index eab0661..3623f4c 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -60,10 +60,10 @@ MAKEOVERRIDES =
 build=@build@
 host=@host@
 target=@target@
-target_noncanonical=@target_noncanonical@
+target_noncanonical:=@target_noncanonical@
 
 # Sed command to transform gcc to installed name.
-program_transform_name = @program_transform_name@
+program_transform_name := @program_transform_name@
 
 # -----------------------------
 # Directories used during build
@@ -595,13 +595,13 @@ BUILD_LDFLAGS=$(LDFLAGS)
 BUILD_CPPFLAGS=$(ALL_CPPFLAGS)
 
 # Actual name to use when installing a native compiler.
-GCC_INSTALL_NAME = `echo gcc|sed '$(program_transform_name)'`
-GCC_TARGET_INSTALL_NAME = $(target_noncanonical)-`echo gcc|sed '$(program_transform_name)'`
-CPP_INSTALL_NAME = `echo cpp|sed '$(program_transform_name)'`
-PROTOIZE_INSTALL_NAME = `echo protoize|sed '$(program_transform_name)'`
-UNPROTOIZE_INSTALL_NAME = `echo unprotoize|sed '$(program_transform_name)'`
-GCOV_INSTALL_NAME = `echo gcov|sed '$(program_transform_name)'`
-GCCBUG_INSTALL_NAME = `echo gccbug|sed '$(program_transform_name)'`
+GCC_INSTALL_NAME := $(shell echo gcc|sed '$(program_transform_name)')
+GCC_TARGET_INSTALL_NAME := $(target_noncanonical)-$(shell echo gcc|sed '$(program_transform_name)')
+CPP_INSTALL_NAME := $(shell echo cpp|sed '$(program_transform_name)')
+PROTOIZE_INSTALL_NAME := $(shell echo protoize|sed '$(program_transform_name)')
+UNPROTOIZE_INSTALL_NAME := $(shell echo unprotoize|sed '$(program_transform_name)')
+GCOV_INSTALL_NAME := $(shell echo gcov|sed '$(program_transform_name)')
+GCCBUG_INSTALL_NAME := $(shell echo gccbug|sed '$(program_transform_name)')
 
 # Setup the testing framework, if you have one
 EXPECT = `if [ -f $${rootme}/../expect/expect ] ; then \

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index c6a5f94..55605d6 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2004-01-20  Kelley Cook  <kcook@gcc.gnu.org>
+
+       * Make-lang.in (CXX_INSTALL_NAME, GXX_INSTALL_NAME, 
+       CXX_TARGET_INSTALL_NAME, GXX_TARGET_INSTALL_NAME): Define via a
+       immediate $(shell) instead of deferred backquote.
+
 2004-01-19  Mark Mitchell  <mark@codesourcery.com>
 
        PR c++/13651

diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in
index 771496b..c239e4b 100644 (file)
--- a/gcc/cp/Make-lang.in
+++ b/gcc/cp/Make-lang.in
@@ -37,10 +37,10 @@
 # - define the names for selecting the language in LANGUAGES.
 
 # Actual names to use when installing a native compiler.
-CXX_INSTALL_NAME = `echo c++|sed '$(program_transform_name)'`
-GXX_INSTALL_NAME = `echo g++|sed '$(program_transform_name)'`
-CXX_TARGET_INSTALL_NAME = $(target_noncanonical)-`echo c++|sed '$(program_transform_name)'`
-GXX_TARGET_INSTALL_NAME = $(target_noncanonical)-`echo g++|sed '$(program_transform_name)'`
+CXX_INSTALL_NAME := $(shell echo c++|sed '$(program_transform_name)')
+GXX_INSTALL_NAME := $(shell echo g++|sed '$(program_transform_name)')
+CXX_TARGET_INSTALL_NAME := $(target_noncanonical)-$(shell echo c++|sed '$(program_transform_name)')
+GXX_TARGET_INSTALL_NAME := $(target_noncanonical)-$(shell echo g++|sed '$(program_transform_name)')
 
 #\f
 # Define the names for selecting c++ in LANGUAGES.

diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog
index f36ad62..68c62bf 100644 (file)
--- a/gcc/f/ChangeLog
+++ b/gcc/f/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-20  Kelley Cook  <kcook@gcc.gnu.org>
+
+       * Make-lang.in (G77_INSTALL_NAME): Define via a immediate $(shell)
+       instead of deferred backquote.
+
 2004-01-15  Kelley Cook  <kcook@gcc.gnu.org>
 
        * Make-lang.in (f77.srcextra): Dummy entry.

diff --git a/gcc/f/Make-lang.in b/gcc/f/Make-lang.in
index 8b8de1b..717bfa2 100644 (file)
--- a/gcc/f/Make-lang.in
+++ b/gcc/f/Make-lang.in
@@ -38,7 +38,7 @@
 # $(srcdir) must be set to the gcc/ source directory (not gcc/f/).
 #\f
 # Actual name to use when installing a native compiler.
-G77_INSTALL_NAME = `echo g77|sed '$(program_transform_name)'`
+G77_INSTALL_NAME := $(shell echo g77|sed '$(program_transform_name)')
 
 # Some versions of `touch' (such as the version on Solaris 2.8) 
 # do not correctly set the timestamp due to buggy versions of `utime'

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index d0e0e92..e7b4c16 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,9 @@
+2004-01-20  Kelley Cook  <kcook@gcc.gnu.org>
+
+       * Make-lang.in (JAVA_INSTALL_NAME, JAVA_TARGET_INSTALL_NAME, 
+       GCJH_TARGET_INSTALL_NAME): Define via a immediate $(shell) 
+       instead of deferred backquote.
+
 2004-01-16  Andrew Pinski  <pinskia@physics.uc.edu>
 
        * typeck.c (find_method_in_interfaces): Move variable

diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in
index 23912e8..00d9270 100644 (file)
--- a/gcc/java/Make-lang.in
+++ b/gcc/java/Make-lang.in
@@ -41,9 +41,9 @@
 # - define the names for selecting the language in LANGUAGES.
 
 # Actual names to use when installing a native compiler.
-JAVA_INSTALL_NAME = `echo gcj|sed '$(program_transform_name)'`
-JAVA_TARGET_INSTALL_NAME = $(target_noncanonical)-`echo gcj|sed '$(program_transform_name)'`
-GCJH_TARGET_INSTALL_NAME = $(target_noncanonical)-`echo gcjh|sed '$(program_transform_name)'`
+JAVA_INSTALL_NAME := $(shell echo gcj|sed '$(program_transform_name)')
+JAVA_TARGET_INSTALL_NAME := $(target_noncanonical)-$(shell echo gcj|sed '$(program_transform_name)')
+GCJH_TARGET_INSTALL_NAME := $(target_noncanonical)-$(shell echo gcjh|sed '$(program_transform_name)')
 
 GCJ = gcj