about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--Makeconfig4
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a9eb4c0370..b6a70c1649 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-04-03  Roland McGrath  <roland@baalperazim.frob.com>
 
+	* Makeconfig (preprocess-versions): Undo last change.
+	Instead, pass -I$(common-objdir) -I$(..)include instead of $(CPPFLAGS).
+
 	* sysdeps/mach/hurd/i386/init-first.c (init): Don't set __environ
 	here, before we might move the stack.
 	(posixland_init): Set __libc_argc, __libc_argc, and __environ here.
diff --git a/Makeconfig b/Makeconfig
index 8ae477aa19..8a7f94849b 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -674,7 +674,9 @@ ifeq (yes, $(build-shared))
 # %ifdef et al based on config.h settings or other %include'd files.
 define preprocess-versions
 sed 's/#.*$$//;s/^[ 	]*%/#/' \
-| $(CC) -E -undef -include $(common-objpfx)config.h -x c - \
+| $(CC) -E -undef -I$(common-objdir) -I$(..)include \
+		  -include $(common-objpfx)config.h \
+		  -x c - \
 | sed 's/#.*$$//;/^[ 	]*$$/d'
 endef