diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 93e9f334a1b..ad5f7c926fb 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-07  Kelley Cook  <kcook@gcc.gnu.org>
+
+	* Makefile.in (echo_quoted_to_gtyp): New template for outputing
+	filenames to gtyp-gen.h.
+	(s-typ-gen): Use it in place of for loops.
+
 2005-07-07  J"orn Rennecke <joern.rennecke@st.com>
 
 	* hooks.c (hook_bool_rtx_int_false): New function.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 20014cbaba5..fe39901235a 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -2724,6 +2724,11 @@ gt-tree-phinodes.h gt-tree-nested.h \
 gt-tree-ssa-operands.h gt-tree-ssa-propagate.h \
 gt-stringpool.h gt-targhooks.h : s-gtype ; @true
 
+define echo_quoted_to_gtyp
+ echo "\"$(gtyp)\", " >> tmp-gtyp.h
+
+endef
+
 gtyp-gen.h: s-gtyp-gen ; @true
 s-gtyp-gen: Makefile
 	echo "/* This file is machine generated.  Do not edit.  */" > tmp-gtyp.h
@@ -2731,24 +2736,16 @@ s-gtyp-gen: Makefile
 	echo "\"$(GTFILES_SRCDIR)\"" >> tmp-gtyp.h
 	echo ";" >> tmp-gtyp.h
 	echo "static const char *const lang_files[] = {" >> tmp-gtyp.h
-	ll="$(GTFILES_FILES_FILES)"; \
-	for f in $$ll; do \
-	echo "\"$$f\", "; done >> tmp-gtyp.h
+	$(foreach gtyp,$(GTFILES_FILES_FILES),$(echo_quoted_to_gtyp))
 	echo "NULL};" >> tmp-gtyp.h
 	echo "static const char *const langs_for_lang_files[] = {" >> tmp-gtyp.h
-	ff="$(GTFILES_FILES_LANGS)"; \
-	for f in $$ff; do \
-	echo "\"$$f\", " ; done  >> tmp-gtyp.h
+	$(foreach gtyp,$(GTFILES_FILES_LANGS),$(echo_quoted_to_gtyp))
 	echo "NULL};" >> tmp-gtyp.h
 	echo "static const char *const all_files[] = {" >> tmp-gtyp.h
-	gf="$(GTFILES)"; \
-	for f in $$gf; do \
-	echo "\"$$f\", "; done >> tmp-gtyp.h
+	$(foreach gtyp,$(GTFILES),$(echo_quoted_to_gtyp))
 	echo " NULL};" >> tmp-gtyp.h
 	echo "static const char *const lang_dir_names[] = { \"c\", " >> tmp-gtyp.h
-	gf="$(GTFILES_LANG_DIR_NAMES)"; \
-	for l in $$gf; do \
-	echo "\"$$l\", "; done >> tmp-gtyp.h
+	$(foreach gtyp,$(GTFILES_LANG_DIR_NAMES),$(echo_quoted_to_gtyp))
 	echo "NULL};" >> tmp-gtyp.h
 	$(SHELL) $(srcdir)/../move-if-change tmp-gtyp.h gtyp-gen.h
 	$(STAMP) s-gtyp-gen