diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f91814a1824..96428ff5d73 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2000-11-11  Zack Weinberg  <zack@wolery.stanford.edu>
+
+	* configure.in: Don't add $outputs to all_lang_makefiles.  Add
+	$srcdir/$s/Makefile.in if it exists.
+	* configure: Regenerate.
+
 Sat Nov 11 18:41:20 2000  Mark P Mitchell  <mark@codesourcery.com>
 
 	* fixinc/mkfixinc.sh: Use the ordinary fixincludes on IRIX.
diff --git a/gcc/configure b/gcc/configure
index 1a2bb46a2d1..f00d1523b3d 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -9585,7 +9585,10 @@ do
 			echo "${srcdir}/$s/config-lang.in doesn't set \$language." 1>&2
 			exit 1
 		fi
-		all_lang_makefiles="$all_lang_makefiles ${srcdir}/$s/Make-lang.in $outputs"
+		all_lang_makefiles="$all_lang_makefiles ${srcdir}/$s/Make-lang.in"
+		if test -f ${srcdir}/$s/Makefile.in
+		then all_lang_makefiles="$all_lang_makefiles ${srcdir}/$s/Makefile.in"
+		fi
 		all_languages="$all_languages $language"
 		if test "x$boot_language" = xyes
 		then
diff --git a/gcc/configure.in b/gcc/configure.in
index a012d3b8e3b..0e12bb5d418 100644
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -5033,7 +5033,10 @@ do
 			echo "${srcdir}/$s/config-lang.in doesn't set \$language." 1>&2
 			exit 1
 		fi
-		all_lang_makefiles="$all_lang_makefiles ${srcdir}/$s/Make-lang.in $outputs"
+		all_lang_makefiles="$all_lang_makefiles ${srcdir}/$s/Make-lang.in"
+		if test -f ${srcdir}/$s/Makefile.in
+		then all_lang_makefiles="$all_lang_makefiles ${srcdir}/$s/Makefile.in"
+		fi
 		all_languages="$all_languages $language"
 		if test "x$boot_language" = xyes
 		then