* Makefile.in (BASEVER, DEVPHASE, DATESTAMP)

	(BASEVER_c, DEVPHASE_c, DATESTAMP_c)
	(BASEVER_s, DEVPHASE_s, DATESTAMP_s, version): Set with :=.
	(itoolsdir, itoolsdatadir): Move definition above new first use.
	(install-itoolsdirs): New rule.
	(install-mkheaders): Depend on install-itoolsdirs, not
	install-include-dir.

From-SVN: r96821

2 files changed, 41 insertions, 26 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 580e7bb..04253e4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2005-03-21  Zack Weinberg  <zack@codesourcery.com>
+
+	* Makefile.in (BASEVER, DEVPHASE, DATESTAMP)
+	(BASEVER_c, DEVPHASE_c, DATESTAMP_c)
+	(BASEVER_s, DEVPHASE_s, DATESTAMP_s, version): Set with :=.
+	(itoolsdir, itoolsdatadir): Move definition above new first use.
+	(install-itoolsdirs): New rule.
+	(install-mkheaders): Depend on install-itoolsdirs, not
+	install-include-dir.
+
 2005-03-21  Kazu Hirata  <kazu@cs.umass.edu>
 
 	* tree-into-ssa.c: Remove obsolete comments.
@@ -405,7 +415,7 @@
 
 	* tree-cfg.c (fold_cond_expr_cond): Use boolean types for condition.
 
-	* cgraph.c (cgraph_remove_node): Avoid loop in code deciding whether 
+	* cgraph.c (cgraph_remove_node): Avoid loop in code deciding whether
 	function body should be released; do not proactively release function
 	bodies in non-unit-at-a-time mode.
 
@@ -434,7 +444,7 @@
 2005-03-17  Dorit Naishlos  <dorit@il.ibm.com>
 
 	PR tree-optimization/20474
-	* tree-vect-analyze.c (vect_analyze_pointer_ref_access): Check the 
+	* tree-vect-analyze.c (vect_analyze_pointer_ref_access): Check the
 	size_type of the relevant pointer. Check for COMPLETE_TYPE_P.
 
 2005-03-17  Kazu Hirata  <kazu@cs.umass.edu>
@@ -487,12 +497,12 @@
 	(ia64_override_options): Move options parsing ...
 	(ia64_handle_option): ... here.  New.
 	* config/ia64/ia64.h (target_flags, MASK_BIG_ENDIAN, MASK_GNU_AS,
-	MASK_GNU_LD, MASK_NO_PIC, MASK_VOL_ASM_STOP, MASK_ILP32, 
+	MASK_GNU_LD, MASK_NO_PIC, MASK_VOL_ASM_STOP, MASK_ILP32,
 	MASK_REG_NAMES, MASK_NO_SDATA, MASK_CONST_GP, MASK_AUTO_PIC,
 	MASK_INLINE_FLOAT_DIV_LAT, MASK_INLINE_FLOAT_DIV_THR,
 	MASK_INLINE_INT_DIV_LAT, MASK_INLINE_INT_DIV_THR,
-	MASK_INLINE_SQRT_LAT, MASK_INLINE_SQRT_THR, MASK_DWARF2_ASM, 
-	MASK_EARLY_STOP_BITS, TARGET_BIG_ENDIAN, TARGET_GNU_AS, TARGET_GNU_LD, 
+	MASK_INLINE_SQRT_LAT, MASK_INLINE_SQRT_THR, MASK_DWARF2_ASM,
+	MASK_EARLY_STOP_BITS, TARGET_BIG_ENDIAN, TARGET_GNU_AS, TARGET_GNU_LD,
 	TARGET_NO_PIC, TARGET_VOL_ASM_STOP, TARGET_ILP32, TARGET_REG_NAMES,
 	TARGET_NO_SDATA, TARGET_CONST_GP, TARGET_AUTO_PIC,
 	TARGET_INLINE_FLOAT_DIV_LAT, TARGET_INLINE_FLOAT_DIV_THR,
@@ -564,7 +574,7 @@
 	* config/alpha/alpha.opt: New file.
 	* config/alpha/alpha.c (alpha_tune): New.  Rename all existing uses
 	of alpha_cpu.
-	(alpha_cpu_string, alpha_tune_string, alpha_tp_string, 
+	(alpha_cpu_string, alpha_tune_string, alpha_tp_string,
 	alpha_fprm_string, alpha_fptm_string): Make static.
 	(alpha_tls_size_string): Remove.
 	(alpha_handle_option): New.
@@ -573,7 +583,7 @@
 	(TARGET_DEFAULT_TARGET_FLAGS): New.
 	(TARGET_HANDLE_OPTION): New.
 	* config/alpha/alpha.h (alpha_tune): Declare.
-	(MASK_FP, MASK_FPREGS, TARGET_FPREGS, MASK_GAS, TARGET_GAS, 
+	(MASK_FP, MASK_FPREGS, TARGET_FPREGS, MASK_GAS, TARGET_GAS,
 	MASK_IEEE_CONFORMANT, TARGET_IEEE_CONFORMANT, MASK_IEEE, TARGET_IEEE,
 	MASK_IEEE_WITH_INEXACT, TARGET_IEEE_WITH_INEXACT, MASK_BUILD_CONSTANTS,
 	TARGET_BUILD_CONSTANTS, MASK_FLOAT_VAX, TARGET_FLOAT_VAX, MASK_BWX,
@@ -612,7 +622,7 @@
 	* tree-vectorizer.c (new_vec_stmt_info): Initialize
 	STMT_VINFO_SUBVARS to NULL.
 	* tree-vect-analyze.c (vect_analyze_data_refs): Ditto.
-	
+
 2005-03-16 Dale Johannesen  <dalej@apple.com>
 
 	* rtlanal.c (find_first_parameter_load):  Rewrite to
@@ -645,7 +655,7 @@
 	(process_pending_assemble_output_defs): Remove.
 
 2005-03-16  Daniel Berlin  <dberlin@dberlin.org>
-	
+
 	Fix PR tree-optimization/20489
 
 	* tree-ssa-alias.c (push_fields_onto_fieldstack): DTRT
@@ -654,7 +664,7 @@
 2005-03-16  Daniel Berlin  <dberlin@dberlin.org>
 
 	Fix PR tree-optimization/20490
-	
+
 	* tree-ssa-pre.c (create_expression_by_pieces): Use
 	force_gimple_operand on result of fold.
 
@@ -678,10 +688,10 @@
 	fold_builtin_strncpy.
 
 2005-03-16  Steven Bosscher  <stevenb@suse.de>
-            Dorit Naishlos  <dorit@il.ibm.com>
+	    Dorit Naishlos  <dorit@il.ibm.com>
 
-	* tree-vect-analyze.c (vect_enhance_data_refs_alignment): Copy 
-	UNITS_PER_SIMD_WORD to a local variable to avoid a "division by zero" 
+	* tree-vect-analyze.c (vect_enhance_data_refs_alignment): Copy
+	UNITS_PER_SIMD_WORD to a local variable to avoid a "division by zero"
 	error.
 
 2005-03-16  Steven Bosscher  <stevenb@suse.de>
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 9306e38..5570d9f 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -685,24 +685,24 @@ GTM_H     = tm.h      $(tm_file_list)
 TM_H      = $(GTM_H) insn-constants.h insn-flags.h
 
 # Variables for version information.
-BASEVER   = $(srcdir)/BASE-VER  # 4.x.y
-DEVPHASE  = $(srcdir)/DEV-PHASE # experimental, prerelease, ""
-DATESTAMP = $(srcdir)/DATESTAMP # YYYYMMDD or empty
+BASEVER     := $(srcdir)/BASE-VER  # 4.x.y
+DEVPHASE    := $(srcdir)/DEV-PHASE # experimental, prerelease, ""
+DATESTAMP   := $(srcdir)/DATESTAMP # YYYYMMDD or empty
 
-BASEVER_c   = $(shell cat $(BASEVER))
-DEVPHASE_c  = $(shell cat $(DEVPHASE))
-DATESTAMP_c = $(shell cat $(DATESTAMP))
+BASEVER_c   := $(shell cat $(BASEVER))
+DEVPHASE_c  := $(shell cat $(DEVPHASE))
+DATESTAMP_c := $(shell cat $(DATESTAMP))
 
-version     = $(BASEVER_c)
+version     := $(BASEVER_c)
 
 # For use in version.c - double quoted strings, with appropriate
 # surrounding punctuation and spaces, and with the datestamp and
 # development phase collapsed to the empty string in release mode
 # (i.e. if DEVPHASE_c is empty).  The space immediately after the
 # comma in the $(if ...) constructs is significant - do not remove it.
-BASEVER_s   = "\"$(BASEVER_c)\""
-DEVPHASE_s  = "\"$(if $(DEVPHASE_c), ($(DEVPHASE_c)))\""
-DATESTAMP_s = "\"$(if $(DEVPHASE_c), $(DATESTAMP_c))\""
+BASEVER_s   := "\"$(BASEVER_c)\""
+DEVPHASE_s  := "\"$(if $(DEVPHASE_c), ($(DEVPHASE_c)))\""
+DATESTAMP_s := "\"$(if $(DEVPHASE_c), $(DATESTAMP_c))\""
 
 # Shorthand variables for dependency lists.
 TARGET_H = $(TM_H) target.h insn-modes.h
@@ -3424,6 +3424,13 @@ install-include-dir: installdirs
 	mkdir $(DESTDIR)$(libsubdir)/include
 	-chmod a+rx $(DESTDIR)$(libsubdir)/include
 
+# Create or recreate the install-tools include file directory.
+itoolsdir = $(libexecsubdir)/install-tools
+itoolsdatadir = $(libsubdir)/install-tools
+install-itoolsdirs: installdirs
+	$(mkinstalldirs) $(DESTDIR)$(itoolsdatadir)/include
+	$(mkinstalldirs) $(DESTDIR)$(itoolsdir)
+
 # Install the include directory using tar.
 install-headers-tar: stmp-int-hdrs $(STMP_FIXPROTO) install-include-dir
 # We use `pwd`/include instead of just include to problems with CDPATH
@@ -3446,10 +3453,8 @@ install-headers-cpio: stmp-int-hdrs $(STMP_FIXPROTO) install-include-dir
 install-headers-cp: stmp-int-hdrs $(STMP_FIXPROTO) install-include-dir
 	cp -p -r include $(DESTDIR)$(libsubdir)
 
-itoolsdir = $(libexecsubdir)/install-tools
-itoolsdatadir = $(libsubdir)/install-tools
 # Install supporting files for fixincludes to be run later.
-install-mkheaders: stmp-int-hdrs $(STMP_FIXPROTO) install-include-dir \
+install-mkheaders: stmp-int-hdrs $(STMP_FIXPROTO) install-itoolsdirs \
   macro_list xlimits.h
 	for file in $(USER_H); do \
 	  realfile=`echo $$file | sed -e 's|.*/\([^/]*\)$$|\1|'`; \