diff --git a/src/Makefile.in b/src/Makefile.in
index 1fd5fa53445c2446169bfea841d61d43902f7ce7..bf07f1e7a1dad8fcbbf691d5a2a079a5830f4cf0 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.in,v 1.128 1999/02/05 05:08:18 mast Exp $
+# $Id: Makefile.in,v 1.129 1999/03/06 06:00:21 hubbe Exp $
 #
 
 # This line is needed on some machines.
@@ -78,7 +78,7 @@ LDFLAGS=@LDFLAGS@ @LINKFORSHARED@ $(EXTRALDFLAGS)
 RUNPIKE=$(TMP_BUILDDIR)/pike -DNOT_INSTALLED -m$(TMP_BUILDDIR)/master.pike $(PIKEOPTS)
 
 MOST_MAKE_FLAGS = "prefix=$(prefix)" "exec_prefix=$(exec_prefix)" "CC=$(CC)" "TMP_BINDIR=$(TMP_BINDIR)" "DEFINES=$(DEFINES)" "TMP_LIBDIR=$(TMP_LIBDIR)" "RUNPIKE=$(RUNPIKE)" "INSTALL=$(INSTALL)" "NOOPTFLAGS=$(NOOPTFLAGS)" "AR=$(AR)"
-MAKE_FLAGS = $(MOST_MAKE_FLAGS) "OTHERFLAGS=$(OTHERFLAGS)" 
+MAKE_FLAGS = $(MOST_MAKE_FLAGS) "OTHERFLAGS=$(OTHERFLAGS)"
 
 # Add alloca.o if you don't have alloca() on your machine.
 #
diff --git a/src/modules/Makefile.in b/src/modules/Makefile.in
index c4a3948383d7b2f0da91c929d75721ee18fec313..6d30d9249e26d7f255d97add44765f89b3d2fc1f 100644
--- a/src/modules/Makefile.in
+++ b/src/modules/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.25 1999/03/01 05:32:44 hubbe Exp $
+# $Id: Makefile.in,v 1.26 1999/03/06 06:00:23 hubbe Exp $
 
 @SET_MAKE@
 
@@ -11,7 +11,7 @@ MODULES=@subdirs@
 MODULE_SEGMENTS=@MODULE_SEGMENTS@
 MODULE_LINKOPTS=@MODULE_LINKOPTS@
 
-MAKE_FLAGS = "prefix=$(prefix)" "exec_prefix=$(exec_prefix)" "CC=$(CC)" "OTHERFLAGS=$(OTHERFLAGS)" "TMP_BINDIR=$(TMP_BINDIR)" "TMP_LIBDIR=$(TMP_LIBDIR)" "RUNPIKE=$(RUNPIKE)" "DEFINES=$(DEFINES)" "INSTALL=$(INSTALL)" "AR=$(AR)"
+MAKE_FLAGS = "prefix=$(prefix)" "exec_prefix=$(exec_prefix)" "CC=$(CC)" "OTHERFLAGS=$(OTHERFLAGS)" "TMP_BINDIR=$(TMP_BINDIR)" "TMP_LIBDIR=$(TMP_LIBDIR)" "RUNPIKE=$(RUNPIKE)" "DEFINES=$(DEFINES)" "INSTALL=$(INSTALL)" "AR=$(AR)" LDFLAGS="$(LDFLAGS)"
 
 all: linker_options modlist.h modlist_headers.h
 
diff --git a/src/modules/dynamic_module_makefile.in b/src/modules/dynamic_module_makefile.in
index a2ac7a3d2a540fe8f1733e3cb2173d7cb9e95f36..bc6b6206b5aa753a3b293651ee4877d387d2e8dc 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.46 1999/03/03 02:39:26 hubbe Exp $
+# $Id: dynamic_module_makefile.in,v 1.47 1999/03/06 06:00:24 hubbe Exp $
 #
 
 
@@ -7,6 +7,9 @@ CC=@CC@
 CPP=@CPP@
 AR=@AR@
 LIBGCC=@LIBGCC@
+REAL_LDFLAGS="@LDFLAGS@"
+REAL_CFLAGS="@CFLAGS@"
+REAL_CPPFLAGS="@CPPFLAGS@"
 
 PIKE_SRC_DIR=$(SRCDIR)/../..
 BUILD_BASE=../..
@@ -39,7 +42,7 @@ modlist_segment: Makefile
 	echo "" >modlist_segment
 
 Makefile: $(MODULE_BASE)/dynamic_module_makefile $(SRCDIR)/Makefile.in $(SRCDIR)/dependencies config.status
-	CONFIG_FILES=Makefile CONFIG_HEADERS="" ./config.status
+	CFLAGS="$(REAL_CFLAGS)" LDFLAGS="$(REAL_LDFLAGS)" CPPFLAGS="$(REAL_CPPFLAGS)" CONFIG_FILES=Makefile CONFIG_HEADERS="" ./config.status
 	touch remake
 	@echo "Run make again"
 	@exit 1
@@ -54,7 +57,7 @@ config.status: $(SRCDIR)/configure
 	./config.status --recheck
 
 module.so: $(OBJS)  $(MODULE_ARCHIVES)
-	$(TMP_BINDIR)/smartlink "@LDSHARED@" -o module.@SO@ $(OBJS) $(MODULE_ARCHIVES) $(MODULE_LDFLAGS) $(LIBGCC) -lc $(LIBGCC)
+	$(TMP_BINDIR)/smartlink "@LDSHARED@" $(LDFLAGS) -o module.@SO@ $(OBJS) $(MODULE_ARCHIVES) $(MODULE_LDFLAGS) $(LIBGCC) -lc $(LIBGCC)
 	if test @SO@ != so ; then mv module.@SO@ module.so ; else :; fi
 
 clean:
diff --git a/src/modules/static_module_makefile.in b/src/modules/static_module_makefile.in
index c48189e4f609fee678e0cd04e9b98f0fbe200995..b3e8cc316fa1e4ebf6409d1a29c4bd62d84688be 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.41 1999/03/03 02:39:27 hubbe Exp $
+# $Id: static_module_makefile.in,v 1.42 1999/03/06 06:00:26 hubbe Exp $
 #
 
 
@@ -10,6 +10,10 @@ PIKE_SRC_DIR=$(SRCDIR)/../..
 BUILD_BASE=../..
 MODULE_BASE=..
 
+REAL_LDFLAGS="@LDFLAGS@"
+REAL_CFLAGS="@CFLAGS@"
+REAL_CPPFLAGS="@CPPFLAGS@"
+
 PREFLAGS=-I. -I$(SRCDIR) -I$(SRCDIR)/../.. -I../.. -I. -Dpike_module_init=pike_module_$(MODNAME)_init -Dpike_module_exit=pike_module_$(MODNAME)_exit $(MODULE_CPPFLAGS) $(DEFINES) 
 CFLAGS=$(PREFLAGS) $(OTHERFLAGS) $(MODULE_CFLAGS)
 
@@ -47,7 +51,7 @@ modlist_segment: Makefile
 	echo >modlist_segment " ,{ \"$(MODNAME)\", pike_module_$(MODNAME)_init, pike_module_$(MODNAME)_exit } "
 
 Makefile: ../static_module_makefile $(SRCDIR)/Makefile.in $(SRCDIR)/dependencies config.status
-	CONFIG_FILES=Makefile CONFIG_HEADERS="" ./config.status
+	CFLAGS="$(REAL_CFLAGS)" LDFLAGS="$(REAL_LDFLAGS)" CPPFLAGS="$(REAL_CPPFLAGS)" CONFIG_FILES=Makefile CONFIG_HEADERS="" ./config.status
 	touch remake
 	@echo "Run make again"
 	@exit 1