diff --git a/src/modules/Mird/libmird/Makefile.in b/src/modules/Mird/libmird/Makefile.in
index 3a6277218aa53e86bebe01436acdf4e25a8bff53..ea0dd5ef0ebae31106125557185716b27ad39e1e 100644
--- a/src/modules/Mird/libmird/Makefile.in
+++ b/src/modules/Mird/libmird/Makefile.in
@@ -1,6 +1,6 @@
 # Makefile for builtin Pike libmird
 
-# $Id: Makefile.in,v 1.4 2002/01/27 17:17:46 mast Exp $
+# $Id: Makefile.in,v 1.5 2002/01/27 17:51:01 mast Exp $
 SRCDIR=@srcdir@
 VPATH=@srcdir@:@srcdir@/../../..:../../..
 
@@ -58,7 +58,7 @@ pure: all
 	cd ../../..; $(MAKE) pure
 
 Makefile: $(SRCDIR)/Makefile.in $(SRCDIR)/dependencies
-	CFLAGS="$(REAL_CFLAGS)" LDFLAGS="$(REAL_LDFLAGS)" CPPFLAGS="$(REAL_CPPFLAGS)" CONFIG_FILES=Makefile CONFIG_HEADERS="$(CONFIG_HEADERS)" ./config.status
+	CONFIG_FILES=Makefile CONFIG_HEADERS="$(CONFIG_HEADERS)" ./config.status
 	@echo "Run make again"
 	@exit 1
 
@@ -69,12 +69,12 @@ $(SRCDIR)/configure: $(SRCDIR)/configure.in $(PIKE_SRC_DIR)/aclocal.m4
 	else :; fi
 
 config.status: $(SRCDIR)/configure
-	CFLAGS="$(REAL_CFLAGS)" LDFLAGS="$(REAL_LDFLAGS)" CPPFLAGS="$(REAL_CPPFLAGS)" ./config.status --recheck
+	CFLAGS="$(REAL_CFLAGS)" LDFLAGS="$(REAL_LDFLAGS)" CPPFLAGS="$(REAL_CPPFLAGS)" BUILDDIR="$(TMP_BUILDDIR)" BINDIR="$(TMP_BINDIR)" ./config.status --recheck
 
 mird.h: $(SRCDIR)/mird.h.in config.status
-	CFLAGS="$(REAL_CFLAGS)" LDFLAGS="$(REAL_LDFLAGS)" CPPFLAGS="$(REAL_CPPFLAGS)" CONFIG_FILES=mird.h CONFIG_HEADERS="" ./config.status
+	CONFIG_FILES=mird.h CONFIG_HEADERS="" ./config.status
 
 config.h: $(SRCDIR)/config.h.in config.status
-	CFLAGS="$(REAL_CFLAGS)" LDFLAGS="$(REAL_LDFLAGS)" CPPFLAGS="$(REAL_CPPFLAGS)" CONFIG_FILES="" CONFIG_HEADERS=config.h ./config.status
+	CONFIG_FILES="" CONFIG_HEADERS=config.h ./config.status
 
 @dependencies@
diff --git a/src/modules/dynamic_module_makefile.in b/src/modules/dynamic_module_makefile.in
index 2086b84399bd7a93c99a19338413c5186a5305d8..bd833c81747529271d417d4231fa5b037f15e2ff 100644
--- a/src/modules/dynamic_module_makefile.in
+++ b/src/modules/dynamic_module_makefile.in
@@ -1,5 +1,5 @@
 #
-# $Id: dynamic_module_makefile.in,v 1.80 2002/01/27 17:10:15 mast Exp $
+# $Id: dynamic_module_makefile.in,v 1.81 2002/01/27 17:51:00 mast Exp $
 #
 
 
@@ -82,10 +82,10 @@ modlist_segment: Makefile
 	@echo "" >modlist_segment
 
 make_variables: $(PIKE_SRC_DIR)/make_variables.in config.status
-	CFLAGS="$(REAL_CFLAGS)" LDFLAGS="$(REAL_LDFLAGS)" CPPFLAGS="$(REAL_CPPFLAGS)" CONFIG_FILES="make_variables:$(BUILD_BASE)/make_variables.in" CONFIG_HEADERS="" ./config.status
+	CONFIG_FILES="make_variables:$(BUILD_BASE)/make_variables.in" CONFIG_HEADERS="" ./config.status
 
 Makefile: $(MODULE_BASE)/dynamic_module_makefile $(SRCDIR)/Makefile.in $(SRCDIR)/dependencies $(SRCDIR)/$(CONFIG_HEADERS).in make_variables config.status
-	CFLAGS="$(REAL_CFLAGS)" LDFLAGS="$(REAL_LDFLAGS)" CPPFLAGS="$(REAL_CPPFLAGS)" CONFIG_FILES=Makefile CONFIG_HEADERS="$(CONFIG_HEADERS)" ./config.status
+	CONFIG_FILES=Makefile CONFIG_HEADERS="$(CONFIG_HEADERS)" ./config.status
 	touch remake
 	@echo "Run make again" >&2
 	@exit 1
@@ -97,7 +97,7 @@ $(SRCDIR)/configure: $(SRCDIR)/configure.in $(PIKE_SRC_DIR)/aclocal.m4
 	else :; fi
 
 config.status: $(SRCDIR)/configure
-	CFLAGS="$(REAL_CFLAGS)" LDFLAGS="$(REAL_LDFLAGS)" CPPFLAGS="$(REAL_CPPFLAGS)" ./config.status --recheck
+	CFLAGS="$(REAL_CFLAGS)" LDFLAGS="$(REAL_LDFLAGS)" CPPFLAGS="$(REAL_CPPFLAGS)" BUILDDIR="$(TMP_BUILDDIR)" BINDIR="$(TMP_BINDIR)" ./config.status --recheck
 
 
 module.so: $(OBJS)  $(MODULE_ARCHIVES)
diff --git a/src/modules/static_module_makefile.in b/src/modules/static_module_makefile.in
index c8c46b330a81598dfcd2d7b0992593deb576a5f7..8c46f0c9122edb9c387fd77e008bf9f9691f4251 100644
--- a/src/modules/static_module_makefile.in
+++ b/src/modules/static_module_makefile.in
@@ -1,5 +1,5 @@
 #
-# $Id: static_module_makefile.in,v 1.71 2002/01/27 17:10:15 mast Exp $
+# $Id: static_module_makefile.in,v 1.72 2002/01/27 17:51:00 mast Exp $
 #
 
 
@@ -81,10 +81,10 @@ modlist_segment: Makefile
 	@echo >modlist_segment " ,{ \"$(MODNAME)\", pike_module_$(MODNAME)_init, pike_module_$(MODNAME)_exit } "
 
 make_variables: $(PIKE_SRC_DIR)/make_variables.in config.status
-	CFLAGS="$(REAL_CFLAGS)" LDFLAGS="$(REAL_LDFLAGS)" CPPFLAGS="$(REAL_CPPFLAGS)" CONFIG_FILES="make_variables:$(BUILD_BASE)/make_variables.in" CONFIG_HEADERS="" ./config.status
+	CONFIG_FILES="make_variables:$(BUILD_BASE)/make_variables.in" CONFIG_HEADERS="" ./config.status
 
 Makefile: $(MODULE_BASE)/static_module_makefile $(SRCDIR)/Makefile.in $(SRCDIR)/dependencies $(SRCDIR)/$(CONFIG_HEADERS).in make_variables config.status
-	CFLAGS="$(REAL_CFLAGS)" LDFLAGS="$(REAL_LDFLAGS)" CPPFLAGS="$(REAL_CPPFLAGS)" CONFIG_FILES=Makefile CONFIG_HEADERS="$(CONFIG_HEADERS)" ./config.status
+	CONFIG_FILES=Makefile CONFIG_HEADERS="$(CONFIG_HEADERS)" ./config.status
 	touch remake
 	@echo "Run make again" >&2
 	@exit 1
@@ -96,7 +96,7 @@ $(SRCDIR)/configure: $(SRCDIR)/configure.in $(PIKE_SRC_DIR)/aclocal.m4
 	else :; fi
 
 config.status: $(SRCDIR)/configure
-	CFLAGS="$(REAL_CFLAGS)" LDFLAGS="$(REAL_LDFLAGS)" CPPFLAGS="$(REAL_CPPFLAGS)" ./config.status --recheck
+	CFLAGS="$(REAL_CFLAGS)" LDFLAGS="$(REAL_LDFLAGS)" CPPFLAGS="$(REAL_CPPFLAGS)" BUILDDIR="$(TMP_BUILDDIR)" BINDIR="$(TMP_BINDIR)" ./config.status --recheck
 
 module.pmod: Makefile
 	@echo "Making module.pmod" ; if [ -f $(SRCDIR)/module.pmod.in ]; then \