diff --git a/libada/ChangeLog b/libada/ChangeLog
index ca8ac2bda47f0054c0f81c14f60e35ee26f46ac5..56cac66709f322629c9b30b885d5146e5fb15aca 100644
--- a/libada/ChangeLog
+++ b/libada/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-25  Daniel Jacobowitz  <drow@false.org>
+
+	* Makefile.in: Add .NOEXPORT.
+
 2004-04-26  Arnaud Charlet  <charlet@act-europe.fr>
 
 	* Makefile.in: Put back merge of some targets to avoid code duplication.
diff --git a/libada/Makefile.in b/libada/Makefile.in
index e77f9cd958f8cc07655edbde011e5858e22ab3fe..9c2077388fb24d98ecb7103f1d69c994047f3708 100644
--- a/libada/Makefile.in
+++ b/libada/Makefile.in
@@ -269,3 +269,7 @@ config.status: $(srcdir)/configure
 
 $(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac
 	cd $(srcdir) && autoconf
+
+# Don't export variables to the environment, in order to not confuse
+# configure.
+.NOEXPORT:
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 82547e29bfee0e3ddde6bd4e86d4c49b271e0f2e..0bd3266ca327d7bb500bf995f80a0fe54a41287c 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-25  Daniel Jacobowitz  <drow@false.org>
+
+	* Makefile.in: Add .NOEXPORT.
+
 2004-04-29  Douglas B Rupp  <rupp@gnat.com>
 
 	* mkstemps.c (mkstemps) [VMS]: Remove special open option. Update
diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
index 78cc4bca864daee537f2c5854a41b7cd38e981ba..9f95c01327f39d6b3addd7b4ec882081cbecc897 100644
--- a/libiberty/Makefile.in
+++ b/libiberty/Makefile.in
@@ -1057,3 +1057,6 @@ $(CONFIGURED_OFILES): stamp-picdir
 	else true; fi
 	$(COMPILE.c) $(srcdir)/xstrerror.c $(OUTPUT_OPTION)
 
+# Don't export variables to the environment, in order to not confuse
+# configure.
+.NOEXPORT:
diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog
index 99f7769dd409fdca6950f02226ba8968f816109f..0fdbb9966e64b1029beb3892a61cc34536410d3a 100644
--- a/libobjc/ChangeLog
+++ b/libobjc/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-25  Daniel Jacobowitz  <drow@false.org>
+
+	* Makefile.in: Add .NOEXPORT.
+
 2004-05-25  Andrew Pinski  <pinskia@physics.uc.edu>
 
 	Merge from the libobjc-branch
diff --git a/libobjc/Makefile.in b/libobjc/Makefile.in
index 28d22a4d6a77bc26fe4568166146ad1d670b18e0..7ee29f4bf0e96994e215f441f73148f8a667cffa 100644
--- a/libobjc/Makefile.in
+++ b/libobjc/Makefile.in
@@ -348,3 +348,7 @@ maintainer-clean realclean: distclean
 
 .PHONY: mostlyclean clean distclean maintainer-clean all check uninstall \
 	install-strip dist installcheck installdirs 
+
+# Don't export variables to the environment, in order to not confuse
+# configure.
+.NOEXPORT: