diff --git a/src/.cvsignore b/src/.cvsignore
index 5a6299417110b72c115591809d3c002574bb8418..4e5af5e9a6f83f2a366497ed5c570f9825643519 100644
--- a/src/.cvsignore
+++ b/src/.cvsignore
@@ -17,10 +17,12 @@ language.h
 lib
 machine.h
 machine.h.in
+make_variables
 master.pike
 peep_engine.c
 pike
 qsort_template.h
+remake
 smartlink
 stamp-h
 stamp-h.in
diff --git a/src/.gitignore b/src/.gitignore
index 861907702cb3d8efc1ac492ceefb749126487c1d..6009a04efca2af976b546e0d56cd6e7080edd3f6 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -17,10 +17,12 @@
 /lib
 /machine.h
 /machine.h.in
+/make_variables
 /master.pike
 /peep_engine.c
 /pike
 /qsort_template.h
+/remake
 /smartlink
 /stamp-h
 /stamp-h.in
diff --git a/src/Makefile.in b/src/Makefile.in
index cc7a483bb316cb4a8bda58f16aaa0fc4e285b533..fc7199a278b7185d142a9f73eb2611b5fcd5edb2 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.in,v 1.166 1999/11/11 17:50:59 grubba Exp $
+# $Id: Makefile.in,v 1.167 1999/11/18 07:58:17 hubbe Exp $
 #
 
 # This line is needed on some machines.
@@ -85,8 +85,7 @@ LDFLAGS=@LDFLAGS@ @LINKFORSHARED@ $(EXTRALDFLAGS)
 RUNPIKE=$(TMP_BUILDDIR)/pike -DNOT_INSTALLED -m$(TMP_BUILDDIR)/master.pike $(PIKEOPTS)
 RUNTPIKE=$(TMP_BUILDDIR)/tpike -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)" "CC=$(CC)" "MAKE=$(MAKE)"
-MAKE_FLAGS = $(MOST_MAKE_FLAGS) "OTHERFLAGS=$(OTHERFLAGS)"
+MAKE_FLAGS=
 
 # Add alloca.o if you don't have alloca() on your machine.
 #
diff --git a/src/aclocal.m4 b/src/aclocal.m4
index ad47fe82a06d13cdd8701e89901032171ccf257e..0fa95a0e4deaafb951c2074b7894c7e913f8e0e9 100644
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -104,7 +104,7 @@ rm -rf conftest*])
 
 define([AC_LOW_MODULE_INIT],
 [
-# $Id: aclocal.m4,v 1.15 1999/11/15 21:39:26 grubba Exp $
+# $Id: aclocal.m4,v 1.16 1999/11/18 07:58:19 hubbe Exp $
 
 MY_AC_PROG_CC
 
@@ -117,6 +117,7 @@ dependencies=$srcdir/dependencies
 
 AC_SUBST_FILE(dynamic_module_makefile)
 AC_SUBST_FILE(static_module_makefile)
+
 ])
 
 
@@ -150,4 +151,80 @@ static_module_makefile=PIKE_INCLUDE_PATH/dynamic_module_makefile
   done
   AC_MSG_RESULT(found)
 ])
+
 ])
+
+pushdef([AC_OUTPUT],
+[
+  AC_SET_MAKE
+
+  AC_SUBST(prefix)
+  export prefix
+  AC_SUBST(exec_prefix)
+  export exec_prefix
+  AC_SUBST(CC)
+  export CC
+  AC_SUBST(BINDIR)
+  export BINDIR
+  AC_SUBST(BUILDDIR)
+  export BUILDDIR
+  AC_SUBST(TMP_LIBDIR)
+  export TMP_BUILDDIR
+  AC_SUBST(TMP_BUILDDIR)
+  export INSTALL
+  AC_SUBST(INSTALL)
+  export AR
+  AC_SUBST(AR)
+  export CFLAGS
+  AC_SUBST(CFLAGS)
+  export CPPFLAGS
+  AC_SUBST(CPPFLAGS)
+  export OPTIMIZE
+  AC_SUBST(OPTIMIZE)
+  export WARN
+  AC_SUBST(WARN)
+
+ifdef([PIKE_INCLUDE_PATH],
+[
+  make_variables_in=PIKE_INCLUDE_PATH/make_variables_in
+],[
+  AC_MSG_CHECKING([for the Pike base directory])
+
+  make_variables_in=make_variables.in
+
+  counter=.
+
+  while test ! -f "$srcdir/$make_variables_in"
+  do
+    counter=.$counter
+    if test $counter = .......... ; then
+      AC_MSG_RESULT(failed)
+      exit 1
+    else
+      :
+    fi
+    make_variables_in=../$make_variables_in
+  done
+
+  AC_MSG_RESULT(found)
+])
+
+  AC_SUBST_FILE(make_variables)
+  make_variables=make_variables
+
+popdef([AC_OUTPUT])
+AC_OUTPUT(make_variables:$make_variables_in $][1,$][2,$][3)
+])
+dnl
+dnl
+dnl
+define(MY_CHECK_FUNCTION,[
+AC_MSG_CHECKING(for working $1)
+AC_CACHE_VAL(pike_cv_func_$1,[
+AC_TRY_RUN([$2],pike_cv_func_$1=yes,pike_cv_func_$1=no,pike_cv_func_$1=no)
+])
+AC_MSG_RESULT([$]pike_cv_func_$1)
+if test [$]pike_cv_func_$1 = yes; then
+AC_DEFINE(translit(HAVE_$1,[a-z],[A-Z]))
+fi])
+
diff --git a/src/configure.in b/src/configure.in
index a86d32ff77f17611b48e83e1b126bd47cb0e25d1..2e55f9773f81a832ac05a96bbeaf4c06710e1804 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -1,4 +1,4 @@
-AC_REVISION("$Id: configure.in,v 1.330 1999/11/13 00:33:17 grubba Exp $")
+AC_REVISION("$Id: configure.in,v 1.331 1999/11/18 07:58:20 hubbe Exp $")
 AC_INIT(interpret.c)
 AC_CONFIG_HEADER(machine.h)
 
@@ -1993,18 +1993,6 @@ pike_cv_hardware_byteorder=0
 AC_MSG_RESULT($pike_cv_hardware_byteorder)
 AC_DEFINE_UNQUOTED(PIKE_BYTEORDER,$pike_cv_hardware_byteorder)
 
-dnl#####################################################################
-
-define(MY_CHECK_FUNCTION,[
-AC_MSG_CHECKING(for working $1)
-AC_CACHE_VAL(pike_cv_func_$1,[
-AC_TRY_RUN([$2],pike_cv_func_$1=yes,pike_cv_func_$1=no,pike_cv_func_$1=no)
-])
-AC_MSG_RESULT([$]pike_cv_func_$1)
-if test [$]pike_cv_func_$1 = yes; then
-AC_DEFINE(translit(HAVE_$1,[a-z],[A-Z]))
-fi])
-
 ########################################################################
 MY_CHECK_FUNCTION(fork,
 [
diff --git a/src/make_variables.in b/src/make_variables.in
new file mode 100644
index 0000000000000000000000000000000000000000..e87217c6dc354253c862433c6c11c4a193d38f97
--- /dev/null
+++ b/src/make_variables.in
@@ -0,0 +1,16 @@
+@SET_MAKE@
+prefix=@prefix@
+exec_prefix=$(prefix)/bin
+CC=@CC@
+TMP_BUILDDIR=@BUILDDIR@
+TMP_BINDIR=@BINDIR@
+DEFINES=@CPPFLAGS@
+TMP_LIBDIR=$(TMP_BUILDDIR)/lib
+RUNPIKE=$(TMP_BUILDDIR)/pike -DNOT_INSTALLED -m$(TMP_BUILDDIR)/master.pike $(PIKEOPTS)
+RUNTPIKE=$(TMP_BUILDDIR)/tpike -DNOT_INSTALLED -m$(TMP_BUILDDIR)/master.pike $(PIKEOPTS)
+OPTIMIZE=@OPTIMIZE@
+INSTALL=@INSTALL@
+OTHERFLAGS=@CFLAGS@ $(OSFLAGS) $(OPTIMIZE) $(WARN) $(PROFIL)
+NOOPTFLAGS=@CFLAGS@ @CPPFLAGS@ $(OSFLAGS) $(WARN) $(PROFIL)
+AR=@AR@
+SRCDIR=@srcdir@
diff --git a/src/modules/.cvsignore b/src/modules/.cvsignore
index e7dc5c3a551ce52b59136272c3cc18c5c61326c7..820115e4164004b737b47daabbcbd7911e62f604 100644
--- a/src/modules/.cvsignore
+++ b/src/modules/.cvsignore
@@ -7,6 +7,7 @@ dependencies
 dynamic_module_makefile
 lib_dirs
 linker_options
+make_variables
 master_lib_dirs
 modlist.h
 modlist_headers.h
diff --git a/src/modules/.gitignore b/src/modules/.gitignore
index 4fbf7d96ce25cdf3648e1c3ccc1bb01d2898abb3..9412079f83a426cccbbd59d4ecf5901efab54ff6 100644
--- a/src/modules/.gitignore
+++ b/src/modules/.gitignore
@@ -7,6 +7,7 @@
 /dynamic_module_makefile
 /lib_dirs
 /linker_options
+/make_variables
 /master_lib_dirs
 /modlist.h
 /modlist_headers.h
diff --git a/src/modules/CommonLog/.cvsignore b/src/modules/CommonLog/.cvsignore
index 8cdfc5ec0bf4162bedcc71c194b267f606b81554..fb57b9338a3a5191fb9aff9cc439adc4a9c1a584 100644
--- a/src/modules/CommonLog/.cvsignore
+++ b/src/modules/CommonLog/.cvsignore
@@ -6,6 +6,7 @@ config.status
 configure
 dependencies
 linker_options
+make_variables
 modlist_headers
 modlist_segment
 module_testsuite
diff --git a/src/modules/CommonLog/.gitignore b/src/modules/CommonLog/.gitignore
index a63f25e58dc3b9696e8bf114179a5457ffc4cc61..229797d1f873a79c4bffe4706fa191f05bb5ee31 100644
--- a/src/modules/CommonLog/.gitignore
+++ b/src/modules/CommonLog/.gitignore
@@ -6,6 +6,7 @@
 /configure
 /dependencies
 /linker_options
+/make_variables
 /modlist_headers
 /modlist_segment
 /module_testsuite
diff --git a/src/modules/CommonLog/Makefile.in b/src/modules/CommonLog/Makefile.in
index f28118a8e9a651d225a61abbc0cc4edad1843463..0b45fc8615d08ce9a5649dbca7b938796c9a3bc1 100644
--- a/src/modules/CommonLog/Makefile.in
+++ b/src/modules/CommonLog/Makefile.in
@@ -1,10 +1,10 @@
 #
-# $Id: Makefile.in,v 1.1 1999/11/14 00:47:21 per Exp $
+# $Id: Makefile.in,v 1.2 1999/11/18 07:58:37 hubbe Exp $
 #
 # Makefile for CommonLog
 #
 
-SRCDIR=@srcdir@
+@make_variables@
 VPATH=@srcdir@:@srcdir@/../..:../..
 MODULE_CPPFLAGS=@DEFS@ @CPPFLAGS@
 OBJS=clf.o
diff --git a/src/modules/Gdbm/.cvsignore b/src/modules/Gdbm/.cvsignore
index 336777f65a9af6abf39d4d6b8774286c72525a42..31bb659802288862c3956fde41402b29a779293e 100644
--- a/src/modules/Gdbm/.cvsignore
+++ b/src/modules/Gdbm/.cvsignore
@@ -8,6 +8,7 @@ dependencies
 gdbm_machine.h
 gdbm_machine.h.in
 linker_options
+make_variables
 modlist_headers
 modlist_segment
 module_testsuite
diff --git a/src/modules/Gdbm/.gitignore b/src/modules/Gdbm/.gitignore
index fb7e52e8ab1757944337143fc47a0a43b78f26f2..191434fea0d7736f8f3c8b1621a63d7c22563d12 100644
--- a/src/modules/Gdbm/.gitignore
+++ b/src/modules/Gdbm/.gitignore
@@ -8,6 +8,7 @@
 /gdbm_machine.h
 /gdbm_machine.h.in
 /linker_options
+/make_variables
 /modlist_headers
 /modlist_segment
 /module_testsuite
diff --git a/src/modules/Gdbm/Makefile.in b/src/modules/Gdbm/Makefile.in
index 6801f54a1dd31e94d507f1bd708d9b4d4601c9d5..eeb4ab97fc0406a9119d4f6d9020a4adab7bd23e 100644
--- a/src/modules/Gdbm/Makefile.in
+++ b/src/modules/Gdbm/Makefile.in
@@ -1,5 +1,5 @@
-# $Id: Makefile.in,v 1.4 1999/04/23 21:32:56 grubba Exp $
-SRCDIR=@srcdir@
+# $Id: Makefile.in,v 1.5 1999/11/18 07:58:46 hubbe Exp $
+@make_variables@
 VPATH=@srcdir@:@srcdir@/../..:../..
 MODULE_LDFLAGS=@LDFLAGS@ @LIBS@
 OBJS=gdbmmod.o
diff --git a/src/modules/Gmp/.cvsignore b/src/modules/Gmp/.cvsignore
index f9287fe274367d441fe3abdc26e1c543f53f5f02..ea0ec0eec9f32403b340f9b9d5835709fa6ff531 100644
--- a/src/modules/Gmp/.cvsignore
+++ b/src/modules/Gmp/.cvsignore
@@ -6,6 +6,7 @@ configure
 dependencies
 gmp_machine.h
 linker_options
+make_variables
 modlist_headers
 modlist_segment
 module_testsuite
diff --git a/src/modules/Gmp/.gitignore b/src/modules/Gmp/.gitignore
index f315ab0790942f450c3689648cdf125c6f18ba9c..14c126a2ec1ce0201379da5dfaccde9d42282278 100644
--- a/src/modules/Gmp/.gitignore
+++ b/src/modules/Gmp/.gitignore
@@ -6,6 +6,7 @@
 /dependencies
 /gmp_machine.h
 /linker_options
+/make_variables
 /modlist_headers
 /modlist_segment
 /module_testsuite
diff --git a/src/modules/Gmp/Makefile.in b/src/modules/Gmp/Makefile.in
index 63947e5cbedfc507a348d38afba076ce10eec579..5336b6518582751959b5c40386807ed39dfef07f 100644
--- a/src/modules/Gmp/Makefile.in
+++ b/src/modules/Gmp/Makefile.in
@@ -1,5 +1,5 @@
-# $Id: Makefile.in,v 1.10 1999/11/01 16:53:36 mirar Exp $
-SRCDIR=@srcdir@
+# $Id: Makefile.in,v 1.11 1999/11/18 07:58:54 hubbe Exp $
+@make_variables@
 VPATH=@srcdir@:@srcdir@/../..:../..
 MODULE_LDFLAGS=@LDFLAGS@ @LIBS@
 OBJS=mpz_glue.o next_prime.o my_mpz_xor.o
diff --git a/src/modules/Gz/.cvsignore b/src/modules/Gz/.cvsignore
index 74d2b84c04da8871ce906855e791ceaf696432ff..3e0a5d635caeabd4ff9aac32421b80b4d74ee163 100644
--- a/src/modules/Gz/.cvsignore
+++ b/src/modules/Gz/.cvsignore
@@ -5,6 +5,7 @@ config.status
 configure
 dependencies
 linker_options
+make_variables
 modlist_headers
 modlist_segment
 module_testsuite
diff --git a/src/modules/Gz/.gitignore b/src/modules/Gz/.gitignore
index 8858fb05ed4a0c301389804575e9c6ba9b0d2f20..c766141b6fdbdd8b64c046c4f877c0b0584aa412 100644
--- a/src/modules/Gz/.gitignore
+++ b/src/modules/Gz/.gitignore
@@ -5,6 +5,7 @@
 /configure
 /dependencies
 /linker_options
+/make_variables
 /modlist_headers
 /modlist_segment
 /module_testsuite
diff --git a/src/modules/Gz/Makefile.in b/src/modules/Gz/Makefile.in
index 2a746608f9e460a251981aa1c233a4ba51810b0d..78446cf65c4cfe5521301353d1917ccb6d3439fc 100644
--- a/src/modules/Gz/Makefile.in
+++ b/src/modules/Gz/Makefile.in
@@ -1,5 +1,5 @@
-# $Id: Makefile.in,v 1.4 1999/04/23 21:33:28 grubba Exp $
-SRCDIR=@srcdir@
+# $Id: Makefile.in,v 1.5 1999/11/18 07:59:03 hubbe Exp $
+@make_variables@
 VPATH=@srcdir@:@srcdir@/../..:../..
 OBJS=zlibmod.o
 MODULE_LDFLAGS=@LDFLAGS@ @LIBS@
diff --git a/src/modules/HTTPLoop/.cvsignore b/src/modules/HTTPLoop/.cvsignore
index ac7a4afa05e6f3de3e509b30484a95562e020ed1..e3d2651bcaa0bb94e694ee5108c59df5bc091b0f 100644
--- a/src/modules/HTTPLoop/.cvsignore
+++ b/src/modules/HTTPLoop/.cvsignore
@@ -6,6 +6,7 @@ config.status
 configure
 dependencies
 linker_options
+make_variables
 modlist_headers
 modlist_segment
 module_testsuite
diff --git a/src/modules/HTTPLoop/.gitignore b/src/modules/HTTPLoop/.gitignore
index 4e3fcaefb48106bfef46464e3aedb63f35582aa0..d843df545ff26024e7c98ff4eb86e5ff9ae8d832 100644
--- a/src/modules/HTTPLoop/.gitignore
+++ b/src/modules/HTTPLoop/.gitignore
@@ -6,6 +6,7 @@
 /configure
 /dependencies
 /linker_options
+/make_variables
 /modlist_headers
 /modlist_segment
 /module_testsuite
diff --git a/src/modules/HTTPLoop/Makefile.in b/src/modules/HTTPLoop/Makefile.in
index 6837036bc8bfabf2b1084b52928d2117e3e48b35..8282b354beacd073fa768aa26ca34c428d5caf41 100644
--- a/src/modules/HTTPLoop/Makefile.in
+++ b/src/modules/HTTPLoop/Makefile.in
@@ -1,5 +1,5 @@
-# $Id: Makefile.in,v 1.1 1999/11/14 00:43:14 per Exp $
-SRCDIR=@srcdir@
+# $Id: Makefile.in,v 1.2 1999/11/18 07:59:12 hubbe Exp $
+@make_variables@
 VPATH=@srcdir@:@srcdir@/../..:../..
 OBJS=accept_and_parse.o util.o cache.o requestobject.o log.o timeout.o 
 # filesystem.o
diff --git a/src/modules/HTTPLoop/configure.in b/src/modules/HTTPLoop/configure.in
index 95b47f113e8cbf5986e2ca4d2045f092301e503f..ae0dcab9fd56b4b9f6121caba6f35728727d4eaf 100644
--- a/src/modules/HTTPLoop/configure.in
+++ b/src/modules/HTTPLoop/configure.in
@@ -1,10 +1,10 @@
-# $Id: configure.in,v 1.1 1999/11/14 00:43:14 per Exp $
+# $Id: configure.in,v 1.2 1999/11/18 07:59:13 hubbe Exp $
 AC_INIT(accept_and_parse.c)
 AC_CONFIG_HEADER(config.h)
 
 AC_SET_MAKE
 
-sinclude(../module_configure.in)
+AC_MODULE_INIT()
 
 AC_CHECK_FUNCS(poll gmtime_r gmtime sendfile)
 
diff --git a/src/modules/Image/.cvsignore b/src/modules/Image/.cvsignore
index 162d6eaf3e7297a41d00516e375e3faf03cb4500..8f3aaf06ddd557bf57a9a71243ae375037412b36 100644
--- a/src/modules/Image/.cvsignore
+++ b/src/modules/Image/.cvsignore
@@ -8,6 +8,7 @@ dependencies
 image_machine.h
 image_machine.h.in
 linker_options
+make_variables
 modlist_headers
 modlist_segment
 module_testsuite
diff --git a/src/modules/Image/.gitignore b/src/modules/Image/.gitignore
index 4e6b9689c8ff2689373e7dbe0c276ef82be78cd1..0f37cb16355da65a312f164106cf3e3204d0ea3e 100644
--- a/src/modules/Image/.gitignore
+++ b/src/modules/Image/.gitignore
@@ -8,6 +8,7 @@
 /image_machine.h
 /image_machine.h.in
 /linker_options
+/make_variables
 /modlist_headers
 /modlist_segment
 /module_testsuite
diff --git a/src/modules/Image/Makefile.in b/src/modules/Image/Makefile.in
index e2b7d166d9c69959c91afac00478456ba101065d..280cdc2f1e0c16fe9c4ce3cb49e764dfe23b8524 100644
--- a/src/modules/Image/Makefile.in
+++ b/src/modules/Image/Makefile.in
@@ -1,5 +1,5 @@
-# $Id: Makefile.in,v 1.30 1999/10/05 05:32:40 hubbe Exp $
-SRCDIR=@srcdir@
+# $Id: Makefile.in,v 1.31 1999/11/18 07:59:21 hubbe Exp $
+@make_variables@
 VPATH=@srcdir@:@srcdir@/../..:../..
 OBJS = image_module.o \
 	image.o font.o matrix.o blit.o pattern.o dct.o \
diff --git a/src/modules/Image/encodings/.cvsignore b/src/modules/Image/encodings/.cvsignore
index 4daaced033e2261fb015fe17697e0caa48fef2a6..a2372d7c307336d535400bae9b3e01c08c39f956 100644
--- a/src/modules/Image/encodings/.cvsignore
+++ b/src/modules/Image/encodings/.cvsignore
@@ -7,6 +7,7 @@ config.status
 configure
 dependencies
 linker_options
+make_variables
 modlist_headers
 modlist_segment
 module_testsuite
diff --git a/src/modules/Image/encodings/.gitignore b/src/modules/Image/encodings/.gitignore
index a5518ba7a2885a895e1d26ee9978ea4a44703cff..14854305fb2b6104c4e95c6725c6d86599292015 100644
--- a/src/modules/Image/encodings/.gitignore
+++ b/src/modules/Image/encodings/.gitignore
@@ -7,6 +7,7 @@
 /configure
 /dependencies
 /linker_options
+/make_variables
 /modlist_headers
 /modlist_segment
 /module_testsuite
diff --git a/src/modules/Java/.cvsignore b/src/modules/Java/.cvsignore
index c03762d717653c9df416281efa7e6ae71b1e97ae..d45d29b97f067ce44f41aee72b02b7925026aac8 100644
--- a/src/modules/Java/.cvsignore
+++ b/src/modules/Java/.cvsignore
@@ -7,6 +7,7 @@ config.status
 configure
 dependencies
 linker_options
+make_variables
 modlist_headers
 modlist_segment
 module_testsuite
diff --git a/src/modules/Java/.gitignore b/src/modules/Java/.gitignore
index a5518ba7a2885a895e1d26ee9978ea4a44703cff..14854305fb2b6104c4e95c6725c6d86599292015 100644
--- a/src/modules/Java/.gitignore
+++ b/src/modules/Java/.gitignore
@@ -7,6 +7,7 @@
 /configure
 /dependencies
 /linker_options
+/make_variables
 /modlist_headers
 /modlist_segment
 /module_testsuite
diff --git a/src/modules/Java/Makefile.in b/src/modules/Java/Makefile.in
index d21e27433016338f85cf21360a88dae9225f7bbc..027c9768bdb31bc1f5bd38e36ed90e3a391833fc 100644
--- a/src/modules/Java/Makefile.in
+++ b/src/modules/Java/Makefile.in
@@ -1,8 +1,8 @@
 #
-# $Id: Makefile.in,v 1.3 1999/04/23 21:34:52 grubba Exp $
+# $Id: Makefile.in,v 1.4 1999/11/18 07:59:37 hubbe Exp $
 #
 
-SRCDIR=@srcdir@
+@make_variables@
 VPATH=@srcdir@:@srcdir@/../..:../..
 MODULE_CPPFLAGS=@DEFS@ @CPPFLAGS@
 OBJS=jvm.o
diff --git a/src/modules/MIME/.cvsignore b/src/modules/MIME/.cvsignore
index c03762d717653c9df416281efa7e6ae71b1e97ae..d45d29b97f067ce44f41aee72b02b7925026aac8 100644
--- a/src/modules/MIME/.cvsignore
+++ b/src/modules/MIME/.cvsignore
@@ -7,6 +7,7 @@ config.status
 configure
 dependencies
 linker_options
+make_variables
 modlist_headers
 modlist_segment
 module_testsuite
diff --git a/src/modules/MIME/.gitignore b/src/modules/MIME/.gitignore
index a5518ba7a2885a895e1d26ee9978ea4a44703cff..14854305fb2b6104c4e95c6725c6d86599292015 100644
--- a/src/modules/MIME/.gitignore
+++ b/src/modules/MIME/.gitignore
@@ -7,6 +7,7 @@
 /configure
 /dependencies
 /linker_options
+/make_variables
 /modlist_headers
 /modlist_segment
 /module_testsuite
diff --git a/src/modules/MIME/Makefile.in b/src/modules/MIME/Makefile.in
index 5f63524f633cf85b2797e998167f968754aa9fef..46e76e8651bd2d6fcdb4b8a4d9344f4605545f14 100644
--- a/src/modules/MIME/Makefile.in
+++ b/src/modules/MIME/Makefile.in
@@ -1,5 +1,5 @@
-# $Id: Makefile.in,v 1.3 1999/04/23 21:35:26 grubba Exp $
-SRCDIR=@srcdir@
+# $Id: Makefile.in,v 1.4 1999/11/18 07:59:46 hubbe Exp $
+@make_variables@
 VPATH=@srcdir@:@srcdir@/../..:../..
 OBJS=mime.o
 MODULE_LDFLAGS=@LDFLAGS@ @LIBS@
diff --git a/src/modules/Makefile.in b/src/modules/Makefile.in
index 1d8392675fdffac454f3ce68897b37b84daf1608..6a0cf3dc3f5a3298c28cf8c110d5fece7b1dfad5 100644
--- a/src/modules/Makefile.in
+++ b/src/modules/Makefile.in
@@ -1,18 +1,13 @@
-# $Id: Makefile.in,v 1.32 1999/10/05 19:48:36 grubba Exp $
+# $Id: Makefile.in,v 1.33 1999/11/18 07:58:29 hubbe Exp $
 
-@SET_MAKE@
+@make_variables@
 
-CC=@CC@
 CPP=@CPP@
-SRCDIR=@srcdir@
-AR=@AR@
 
 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)" LDFLAGS="$(LDFLAGS)" "CC=$(CC)" "MAKE=$(MAKE)" "NOOPTFLAGS=$(NOOPTFLAGS)"
-
 all: linker_options modlist.h modlist_headers.h
 
 $(MODULE_SEGMENTS) $(MODULE_LINKOPTS): modules
diff --git a/src/modules/Math/.cvsignore b/src/modules/Math/.cvsignore
index ac7a4afa05e6f3de3e509b30484a95562e020ed1..e3d2651bcaa0bb94e694ee5108c59df5bc091b0f 100644
--- a/src/modules/Math/.cvsignore
+++ b/src/modules/Math/.cvsignore
@@ -6,6 +6,7 @@ config.status
 configure
 dependencies
 linker_options
+make_variables
 modlist_headers
 modlist_segment
 module_testsuite
diff --git a/src/modules/Math/.gitignore b/src/modules/Math/.gitignore
index 4e3fcaefb48106bfef46464e3aedb63f35582aa0..d843df545ff26024e7c98ff4eb86e5ff9ae8d832 100644
--- a/src/modules/Math/.gitignore
+++ b/src/modules/Math/.gitignore
@@ -6,6 +6,7 @@
 /configure
 /dependencies
 /linker_options
+/make_variables
 /modlist_headers
 /modlist_segment
 /module_testsuite
diff --git a/src/modules/Math/Makefile.in b/src/modules/Math/Makefile.in
index edf831ba8581b555df2eb0dfaef1e0289f22c862..4d4f2fe2c70e6329dba80e98ddffbbc89e56668d 100644
--- a/src/modules/Math/Makefile.in
+++ b/src/modules/Math/Makefile.in
@@ -1,5 +1,5 @@
-# $Id: Makefile.in,v 1.3 1999/04/24 13:15:29 grubba Exp $
-SRCDIR=@srcdir@
+# $Id: Makefile.in,v 1.4 1999/11/18 07:59:55 hubbe Exp $
+@make_variables@
 VPATH=@srcdir@:@srcdir@/../..:../..
 OBJS=math_module.o math_matrix.o
 MODULE_LDFLAGS=@LDFLAGS@ @LIBS@
diff --git a/src/modules/Msql/.cvsignore b/src/modules/Msql/.cvsignore
index 5cc573c2072e159f9d10fc849903514962bb5eb6..85c4c9015d148d388818c6a2cf53c8ac94ebb8e1 100644
--- a/src/modules/Msql/.cvsignore
+++ b/src/modules/Msql/.cvsignore
@@ -4,6 +4,7 @@ config.status
 configure
 dependencies
 linker_options
+make_variables
 modlist_headers
 modlist_segment
 module_testsuite
diff --git a/src/modules/Msql/.gitignore b/src/modules/Msql/.gitignore
index a1f4411e7224f10a9601f4e0c90c03aa8860f0af..76a0ee797ab3b4de7cd69a262eb8c598cbfc175d 100644
--- a/src/modules/Msql/.gitignore
+++ b/src/modules/Msql/.gitignore
@@ -4,6 +4,7 @@
 /configure
 /dependencies
 /linker_options
+/make_variables
 /modlist_headers
 /modlist_segment
 /module_testsuite
diff --git a/src/modules/Msql/Makefile.in b/src/modules/Msql/Makefile.in
index 693d4b87c0a598dc5515cfc7af2ef458a2aa6862..68288e6ed3650cbefb016526417deb27b652d0b0 100644
--- a/src/modules/Msql/Makefile.in
+++ b/src/modules/Msql/Makefile.in
@@ -1,5 +1,5 @@
-# $Id: Makefile.in,v 1.4 1999/04/23 21:35:52 grubba Exp $
-SRCDIR=@srcdir@
+# $Id: Makefile.in,v 1.5 1999/11/18 08:00:04 hubbe Exp $
+@make_variables@
 VPATH=@srcdir@:@srcdir@/../..:../..
 OBJS=msqlmod.o
 MODULE_LDFLAGS=@LDFLAGS@ @LIBS@
diff --git a/src/modules/Mysql/.cvsignore b/src/modules/Mysql/.cvsignore
index c03762d717653c9df416281efa7e6ae71b1e97ae..d45d29b97f067ce44f41aee72b02b7925026aac8 100644
--- a/src/modules/Mysql/.cvsignore
+++ b/src/modules/Mysql/.cvsignore
@@ -7,6 +7,7 @@ config.status
 configure
 dependencies
 linker_options
+make_variables
 modlist_headers
 modlist_segment
 module_testsuite
diff --git a/src/modules/Mysql/.gitignore b/src/modules/Mysql/.gitignore
index a5518ba7a2885a895e1d26ee9978ea4a44703cff..14854305fb2b6104c4e95c6725c6d86599292015 100644
--- a/src/modules/Mysql/.gitignore
+++ b/src/modules/Mysql/.gitignore
@@ -7,6 +7,7 @@
 /configure
 /dependencies
 /linker_options
+/make_variables
 /modlist_headers
 /modlist_segment
 /module_testsuite
diff --git a/src/modules/Mysql/Makefile.in b/src/modules/Mysql/Makefile.in
index 1b89c1ecc10221ea8135f023f34623103c53554f..81100182c6cacb2ef69c6f6cb46376c96d747307 100644
--- a/src/modules/Mysql/Makefile.in
+++ b/src/modules/Mysql/Makefile.in
@@ -1,8 +1,8 @@
 #
-# $Id: Makefile.in,v 1.4 1999/04/23 21:36:16 grubba Exp $
+# $Id: Makefile.in,v 1.5 1999/11/18 08:00:13 hubbe Exp $
 #
 
-SRCDIR=@srcdir@
+@make_variables@
 VPATH=@srcdir@:@srcdir@/../..:../..
 MODULE_CPPFLAGS=@DEFS@ @CPPFLAGS@
 OBJS=mysql.o result.o
diff --git a/src/modules/Odbc/.cvsignore b/src/modules/Odbc/.cvsignore
index c03762d717653c9df416281efa7e6ae71b1e97ae..d45d29b97f067ce44f41aee72b02b7925026aac8 100644
--- a/src/modules/Odbc/.cvsignore
+++ b/src/modules/Odbc/.cvsignore
@@ -7,6 +7,7 @@ config.status
 configure
 dependencies
 linker_options
+make_variables
 modlist_headers
 modlist_segment
 module_testsuite
diff --git a/src/modules/Odbc/.gitignore b/src/modules/Odbc/.gitignore
index a5518ba7a2885a895e1d26ee9978ea4a44703cff..14854305fb2b6104c4e95c6725c6d86599292015 100644
--- a/src/modules/Odbc/.gitignore
+++ b/src/modules/Odbc/.gitignore
@@ -7,6 +7,7 @@
 /configure
 /dependencies
 /linker_options
+/make_variables
 /modlist_headers
 /modlist_segment
 /module_testsuite
diff --git a/src/modules/Odbc/Makefile.in b/src/modules/Odbc/Makefile.in
index c4e7d5ae01a481d7995a72a9d145012cc5bcec00..d2408ef5b2e26e8887c52e8b2c4c428e68d02b70 100644
--- a/src/modules/Odbc/Makefile.in
+++ b/src/modules/Odbc/Makefile.in
@@ -1,8 +1,8 @@
 #
-# $Id: Makefile.in,v 1.3 1999/04/23 21:36:47 grubba Exp $
+# $Id: Makefile.in,v 1.4 1999/11/18 08:00:22 hubbe Exp $
 #
 
-SRCDIR=@srcdir@
+@make_variables@
 VPATH=@srcdir@:@srcdir@/../..:../..
 MODULE_CPPFLAGS=@DEFS@ @CPPFLAGS@
 OBJS=odbc.o odbc_result.o
diff --git a/src/modules/Oracle/.cvsignore b/src/modules/Oracle/.cvsignore
index c03762d717653c9df416281efa7e6ae71b1e97ae..d45d29b97f067ce44f41aee72b02b7925026aac8 100644
--- a/src/modules/Oracle/.cvsignore
+++ b/src/modules/Oracle/.cvsignore
@@ -7,6 +7,7 @@ config.status
 configure
 dependencies
 linker_options
+make_variables
 modlist_headers
 modlist_segment
 module_testsuite
diff --git a/src/modules/Oracle/.gitignore b/src/modules/Oracle/.gitignore
index a5518ba7a2885a895e1d26ee9978ea4a44703cff..14854305fb2b6104c4e95c6725c6d86599292015 100644
--- a/src/modules/Oracle/.gitignore
+++ b/src/modules/Oracle/.gitignore
@@ -7,6 +7,7 @@
 /configure
 /dependencies
 /linker_options
+/make_variables
 /modlist_headers
 /modlist_segment
 /module_testsuite
diff --git a/src/modules/Oracle/Makefile.in b/src/modules/Oracle/Makefile.in
index 6d59aef6b201de4e2194ea8fc4bc2bbe78d6a8ef..72c4f04e7a46525fe08c1d6151cc1ad0c5993264 100644
--- a/src/modules/Oracle/Makefile.in
+++ b/src/modules/Oracle/Makefile.in
@@ -1,8 +1,8 @@
 #
-# $Id: Makefile.in,v 1.2 1999/04/23 21:37:07 grubba Exp $
+# $Id: Makefile.in,v 1.3 1999/11/18 08:00:30 hubbe Exp $
 #
 
-SRCDIR=@srcdir@
+@make_variables@
 VPATH=@srcdir@:@srcdir@/../..:../..
 MODULE_CPPFLAGS=@DEFS@ @CPPFLAGS@
 OBJS=oracle.o
diff --git a/src/modules/Parser/.cvsignore b/src/modules/Parser/.cvsignore
index ac7a4afa05e6f3de3e509b30484a95562e020ed1..e3d2651bcaa0bb94e694ee5108c59df5bc091b0f 100644
--- a/src/modules/Parser/.cvsignore
+++ b/src/modules/Parser/.cvsignore
@@ -6,6 +6,7 @@ config.status
 configure
 dependencies
 linker_options
+make_variables
 modlist_headers
 modlist_segment
 module_testsuite
diff --git a/src/modules/Parser/.gitignore b/src/modules/Parser/.gitignore
index 4e3fcaefb48106bfef46464e3aedb63f35582aa0..d843df545ff26024e7c98ff4eb86e5ff9ae8d832 100644
--- a/src/modules/Parser/.gitignore
+++ b/src/modules/Parser/.gitignore
@@ -6,6 +6,7 @@
 /configure
 /dependencies
 /linker_options
+/make_variables
 /modlist_headers
 /modlist_segment
 /module_testsuite
diff --git a/src/modules/Parser/Makefile.in b/src/modules/Parser/Makefile.in
index 709c41ca9e3a8e6f96a37a429ba34483fb81e4d0..7f8401dad551217883ca9e65b3686444a527269c 100644
--- a/src/modules/Parser/Makefile.in
+++ b/src/modules/Parser/Makefile.in
@@ -1,5 +1,5 @@
-# $Id: Makefile.in,v 1.2 1999/04/23 21:37:27 grubba Exp $
-SRCDIR=@srcdir@
+# $Id: Makefile.in,v 1.3 1999/11/18 08:00:38 hubbe Exp $
+@make_variables@
 VPATH=@srcdir@:@srcdir@/../..:../..
 OBJS=parser.o html.o
 MODULE_LDFLAGS=@LDFLAGS@ @LIBS@
diff --git a/src/modules/Perl/.cvsignore b/src/modules/Perl/.cvsignore
index 1994e20440b8fab9feff9dd85464d98029fbd1e0..0a1be682d4f5a8cf409d24a8ac6ae19141613359 100644
--- a/src/modules/Perl/.cvsignore
+++ b/src/modules/Perl/.cvsignore
@@ -5,6 +5,7 @@ config.status
 configure
 dependencies
 linker_options
+make_variables
 modlist_headers
 modlist_segment
 module_testsuite
diff --git a/src/modules/Perl/.gitignore b/src/modules/Perl/.gitignore
index 843fcebdd55a115aeb39ee0b79a44f82cba7771f..19967e920e8aa1d96452e93678f68e9de0ec1e44 100644
--- a/src/modules/Perl/.gitignore
+++ b/src/modules/Perl/.gitignore
@@ -5,6 +5,7 @@
 /configure
 /dependencies
 /linker_options
+/make_variables
 /modlist_headers
 /modlist_segment
 /module_testsuite
diff --git a/src/modules/Perl/Makefile.in b/src/modules/Perl/Makefile.in
index ea786e341cc82f2f505c643869c1779cfcfad537..1aab288d10f389f0782d4d99e2e069252fee8bc5 100644
--- a/src/modules/Perl/Makefile.in
+++ b/src/modules/Perl/Makefile.in
@@ -1,5 +1,5 @@
-# $Id: Makefile.in,v 1.3 1999/04/23 21:37:46 grubba Exp $
-SRCDIR=@srcdir@
+# $Id: Makefile.in,v 1.4 1999/11/18 08:00:47 hubbe Exp $
+@make_variables@
 VPATH=@srcdir@:@srcdir@/../..:../..
 MODULE_LDFLAGS=@LDFLAGS@ @LIBS@ @PERL_LDFLAGS@
 OBJS=perlmod.o @extra_objs@
diff --git a/src/modules/Pipe/.cvsignore b/src/modules/Pipe/.cvsignore
index 4daaced033e2261fb015fe17697e0caa48fef2a6..a2372d7c307336d535400bae9b3e01c08c39f956 100644
--- a/src/modules/Pipe/.cvsignore
+++ b/src/modules/Pipe/.cvsignore
@@ -7,6 +7,7 @@ config.status
 configure
 dependencies
 linker_options
+make_variables
 modlist_headers
 modlist_segment
 module_testsuite
diff --git a/src/modules/Pipe/.gitignore b/src/modules/Pipe/.gitignore
index a5518ba7a2885a895e1d26ee9978ea4a44703cff..14854305fb2b6104c4e95c6725c6d86599292015 100644
--- a/src/modules/Pipe/.gitignore
+++ b/src/modules/Pipe/.gitignore
@@ -7,6 +7,7 @@
 /configure
 /dependencies
 /linker_options
+/make_variables
 /modlist_headers
 /modlist_segment
 /module_testsuite
diff --git a/src/modules/Pipe/Makefile.in b/src/modules/Pipe/Makefile.in
index 77fc09f1d0831a0c297fc0165e1407c7383557eb..5bc13e22249262aa3480cea24b58789862fa6648 100644
--- a/src/modules/Pipe/Makefile.in
+++ b/src/modules/Pipe/Makefile.in
@@ -1,5 +1,5 @@
-# $Id: Makefile.in,v 1.4 1999/04/23 21:38:09 grubba Exp $
-SRCDIR=@srcdir@
+# $Id: Makefile.in,v 1.5 1999/11/18 08:00:56 hubbe Exp $
+@make_variables@
 VPATH=@srcdir@:@srcdir@/../..:../..
 OBJS=pipe.o
 MODULE_LDFLAGS=@LDFLAGS@
diff --git a/src/modules/Postgres/.cvsignore b/src/modules/Postgres/.cvsignore
index e0cdfc4217ccc3b6d4aaeffdc3490e15f79709fb..8c2ee6fd7c95e12b55f4ed3618f4223d8ea21e7f 100644
--- a/src/modules/Postgres/.cvsignore
+++ b/src/modules/Postgres/.cvsignore
@@ -4,6 +4,7 @@ config.status
 configure
 dependencies
 linker_options
+make_variables
 modlist_headers
 modlist_segment
 module_testsuite
diff --git a/src/modules/Postgres/.gitignore b/src/modules/Postgres/.gitignore
index da2dacc0a32cc4f5e14cb8b2d586200982dcb819..56107e2056b9d614e60ccc38824daa5abfe28570 100644
--- a/src/modules/Postgres/.gitignore
+++ b/src/modules/Postgres/.gitignore
@@ -4,6 +4,7 @@
 /configure
 /dependencies
 /linker_options
+/make_variables
 /modlist_headers
 /modlist_segment
 /module_testsuite
diff --git a/src/modules/Postgres/Makefile.in b/src/modules/Postgres/Makefile.in
index 3e7539819d39bcb10f579bfb77b32684587a1aa1..c6a2d3c8bb22ba9337c93ed3360811d3acbb0a94 100644
--- a/src/modules/Postgres/Makefile.in
+++ b/src/modules/Postgres/Makefile.in
@@ -1,7 +1,7 @@
-# $Id: Makefile.in,v 1.4 1999/04/23 21:38:32 grubba Exp $
+# $Id: Makefile.in,v 1.5 1999/11/18 08:01:05 hubbe Exp $
 # (C) 1997 Francesco Chemolli <kinkie@kame.usr.dsi.unimi.it>
 
-SRCDIR=@srcdir@
+@make_variables@
 VPATH=@srcdir@:@srcdir@/../..:../..
 MODULE_CPPFLAGS=@DEFS@ @CPPFLAGS@
 MODULE_LDFLAGS=@LDFLAGS@ @LIBS@
diff --git a/src/modules/Regexp/.cvsignore b/src/modules/Regexp/.cvsignore
index c03762d717653c9df416281efa7e6ae71b1e97ae..d45d29b97f067ce44f41aee72b02b7925026aac8 100644
--- a/src/modules/Regexp/.cvsignore
+++ b/src/modules/Regexp/.cvsignore
@@ -7,6 +7,7 @@ config.status
 configure
 dependencies
 linker_options
+make_variables
 modlist_headers
 modlist_segment
 module_testsuite
diff --git a/src/modules/Regexp/.gitignore b/src/modules/Regexp/.gitignore
index a5518ba7a2885a895e1d26ee9978ea4a44703cff..14854305fb2b6104c4e95c6725c6d86599292015 100644
--- a/src/modules/Regexp/.gitignore
+++ b/src/modules/Regexp/.gitignore
@@ -7,6 +7,7 @@
 /configure
 /dependencies
 /linker_options
+/make_variables
 /modlist_headers
 /modlist_segment
 /module_testsuite
diff --git a/src/modules/Regexp/Makefile.in b/src/modules/Regexp/Makefile.in
index ea428bece25dc0fcd9caa38553f7dd3e86aedba4..d098c7d6f05e1a8202aa5b99c01511b279ab6ea6 100644
--- a/src/modules/Regexp/Makefile.in
+++ b/src/modules/Regexp/Makefile.in
@@ -1,5 +1,5 @@
-# $Id: Makefile.in,v 1.6 1999/04/23 21:38:55 grubba Exp $
-SRCDIR=@srcdir@
+# $Id: Makefile.in,v 1.7 1999/11/18 08:01:14 hubbe Exp $
+@make_variables@
 VPATH=@srcdir@:@srcdir@/../..:../..
 OBJS=glue.o @REGEXP_OBJS@ 
 MODULE_LDFLAGS=@LDFLAGS@
diff --git a/src/modules/Ssleay/.cvsignore b/src/modules/Ssleay/.cvsignore
index c03762d717653c9df416281efa7e6ae71b1e97ae..d45d29b97f067ce44f41aee72b02b7925026aac8 100644
--- a/src/modules/Ssleay/.cvsignore
+++ b/src/modules/Ssleay/.cvsignore
@@ -7,6 +7,7 @@ config.status
 configure
 dependencies
 linker_options
+make_variables
 modlist_headers
 modlist_segment
 module_testsuite
diff --git a/src/modules/Ssleay/.gitignore b/src/modules/Ssleay/.gitignore
index a5518ba7a2885a895e1d26ee9978ea4a44703cff..14854305fb2b6104c4e95c6725c6d86599292015 100644
--- a/src/modules/Ssleay/.gitignore
+++ b/src/modules/Ssleay/.gitignore
@@ -7,6 +7,7 @@
 /configure
 /dependencies
 /linker_options
+/make_variables
 /modlist_headers
 /modlist_segment
 /module_testsuite
diff --git a/src/modules/Ssleay/Makefile.in b/src/modules/Ssleay/Makefile.in
index 38d9588fcda1ad3cca72c3f21c3ef278d196a5ed..2583c7aaa84e7437f7314de798f69b83609bc2fc 100644
--- a/src/modules/Ssleay/Makefile.in
+++ b/src/modules/Ssleay/Makefile.in
@@ -1,5 +1,5 @@
-# $Id: Makefile.in,v 1.4 1999/04/23 21:39:18 grubba Exp $
-SRCDIR=@srcdir@
+# $Id: Makefile.in,v 1.5 1999/11/18 08:01:22 hubbe Exp $
+@make_variables@
 VPATH=@srcdir@:@srcdir@/../..:../..
 MODULE_CFLAGS=@DEFS@ @CPPFLAGS@
 OBJS=ssleay.o
diff --git a/src/modules/Yp/.cvsignore b/src/modules/Yp/.cvsignore
index c03762d717653c9df416281efa7e6ae71b1e97ae..d45d29b97f067ce44f41aee72b02b7925026aac8 100644
--- a/src/modules/Yp/.cvsignore
+++ b/src/modules/Yp/.cvsignore
@@ -7,6 +7,7 @@ config.status
 configure
 dependencies
 linker_options
+make_variables
 modlist_headers
 modlist_segment
 module_testsuite
diff --git a/src/modules/Yp/.gitignore b/src/modules/Yp/.gitignore
index a5518ba7a2885a895e1d26ee9978ea4a44703cff..14854305fb2b6104c4e95c6725c6d86599292015 100644
--- a/src/modules/Yp/.gitignore
+++ b/src/modules/Yp/.gitignore
@@ -7,6 +7,7 @@
 /configure
 /dependencies
 /linker_options
+/make_variables
 /modlist_headers
 /modlist_segment
 /module_testsuite
diff --git a/src/modules/Yp/Makefile.in b/src/modules/Yp/Makefile.in
index 316dfe2808dcb980dea8437bab7db3588d58f246..ad01968f2df4727f9ad1d949a74d02ad3489fd9a 100644
--- a/src/modules/Yp/Makefile.in
+++ b/src/modules/Yp/Makefile.in
@@ -1,5 +1,5 @@
-# $Id: Makefile.in,v 1.4 1999/04/23 21:40:12 grubba Exp $
-SRCDIR=@srcdir@
+# $Id: Makefile.in,v 1.5 1999/11/18 08:01:31 hubbe Exp $
+@make_variables@
 VPATH=@srcdir@:@srcdir@/../..:../..
 OBJS=yp.o
 MODULE_LDFLAGS=@LDFLAGS@ @LIBS@
diff --git a/src/modules/_Charset/.cvsignore b/src/modules/_Charset/.cvsignore
index c03762d717653c9df416281efa7e6ae71b1e97ae..d45d29b97f067ce44f41aee72b02b7925026aac8 100644
--- a/src/modules/_Charset/.cvsignore
+++ b/src/modules/_Charset/.cvsignore
@@ -7,6 +7,7 @@ config.status
 configure
 dependencies
 linker_options
+make_variables
 modlist_headers
 modlist_segment
 module_testsuite
diff --git a/src/modules/_Charset/.gitignore b/src/modules/_Charset/.gitignore
index a5518ba7a2885a895e1d26ee9978ea4a44703cff..14854305fb2b6104c4e95c6725c6d86599292015 100644
--- a/src/modules/_Charset/.gitignore
+++ b/src/modules/_Charset/.gitignore
@@ -7,6 +7,7 @@
 /configure
 /dependencies
 /linker_options
+/make_variables
 /modlist_headers
 /modlist_segment
 /module_testsuite
diff --git a/src/modules/_Charset/Makefile.in b/src/modules/_Charset/Makefile.in
index a2ea67ad907a736c6b9546a8a89375328c019fe5..9fa5921b076007794de1d8bea3c7332c4b858659 100644
--- a/src/modules/_Charset/Makefile.in
+++ b/src/modules/_Charset/Makefile.in
@@ -1,8 +1,8 @@
 #
-# $Id: Makefile.in,v 1.3 1999/04/23 21:41:00 grubba Exp $
+# $Id: Makefile.in,v 1.4 1999/11/18 08:01:39 hubbe Exp $
 #
 
-SRCDIR=@srcdir@
+@make_variables@
 VPATH=@srcdir@:@srcdir@/../..:../..
 MODULE_CPPFLAGS=@DEFS@ @CPPFLAGS@
 OBJS=charsetmod.o iso2022.o tables.o misc.o
diff --git a/src/modules/_Crypto/.cvsignore b/src/modules/_Crypto/.cvsignore
index c03762d717653c9df416281efa7e6ae71b1e97ae..d45d29b97f067ce44f41aee72b02b7925026aac8 100644
--- a/src/modules/_Crypto/.cvsignore
+++ b/src/modules/_Crypto/.cvsignore
@@ -7,6 +7,7 @@ config.status
 configure
 dependencies
 linker_options
+make_variables
 modlist_headers
 modlist_segment
 module_testsuite
diff --git a/src/modules/_Crypto/.gitignore b/src/modules/_Crypto/.gitignore
index a5518ba7a2885a895e1d26ee9978ea4a44703cff..14854305fb2b6104c4e95c6725c6d86599292015 100644
--- a/src/modules/_Crypto/.gitignore
+++ b/src/modules/_Crypto/.gitignore
@@ -7,6 +7,7 @@
 /configure
 /dependencies
 /linker_options
+/make_variables
 /modlist_headers
 /modlist_segment
 /module_testsuite
diff --git a/src/modules/_Crypto/Makefile.in b/src/modules/_Crypto/Makefile.in
index 0882b7127654ca8bc762824613698cd6605adc3e..aa04a2b015490182696d55827b9df06a01c17e51 100644
--- a/src/modules/_Crypto/Makefile.in
+++ b/src/modules/_Crypto/Makefile.in
@@ -1,5 +1,5 @@
-# $Id: Makefile.in,v 1.18 1999/04/23 21:41:37 grubba Exp $
-SRCDIR=@srcdir@
+# $Id: Makefile.in,v 1.19 1999/11/18 08:01:48 hubbe Exp $
+@make_variables@
 VPATH=@srcdir@:@srcdir@/../..:../..
 
 # BEGIN NATIONAL SECURITY
diff --git a/src/modules/_Crypto/lib/.cvsignore b/src/modules/_Crypto/lib/.cvsignore
index 8d540df7d3d4be019445f4d7d3b8ea6c52cc4525..8ff81c0961b2c4f8c3199dd394e327867e869600 100644
--- a/src/modules/_Crypto/lib/.cvsignore
+++ b/src/modules/_Crypto/lib/.cvsignore
@@ -10,5 +10,6 @@ desSmallCore.c
 desSmallFips.c
 desdata
 keymap.h
+make_variables
 parity.h
 rotors.h
diff --git a/src/modules/_Crypto/lib/.gitignore b/src/modules/_Crypto/lib/.gitignore
index 067cdda10fb81030fc0b33959e39e254eed60875..db4cfc348f9840907a4e2911c908b30cce8a9024 100644
--- a/src/modules/_Crypto/lib/.gitignore
+++ b/src/modules/_Crypto/lib/.gitignore
@@ -10,5 +10,6 @@
 /desSmallFips.c
 /desdata
 /keymap.h
+/make_variables
 /parity.h
 /rotors.h
diff --git a/src/modules/_Image_JPEG/.cvsignore b/src/modules/_Image_JPEG/.cvsignore
index 4c4abb584f6d9a7910fed717c046546ed81175a2..a2372d7c307336d535400bae9b3e01c08c39f956 100644
--- a/src/modules/_Image_JPEG/.cvsignore
+++ b/src/modules/_Image_JPEG/.cvsignore
@@ -1,14 +1,15 @@
 .pure
 Makefile
+config.h
+config.h.in 
 config.log
 config.status
 configure
 dependencies
 linker_options
+make_variables
 modlist_headers
 modlist_segment
 module_testsuite
 stamp-h
 stamp-h.in
-config.h
-config.h.in 
diff --git a/src/modules/_Image_JPEG/.gitignore b/src/modules/_Image_JPEG/.gitignore
index e9be9e87737786aa2ee941b8904d5d467fc32258..14854305fb2b6104c4e95c6725c6d86599292015 100644
--- a/src/modules/_Image_JPEG/.gitignore
+++ b/src/modules/_Image_JPEG/.gitignore
@@ -1,14 +1,15 @@
 /.pure
 /Makefile
+/config.h
+/config.h.in
 /config.log
 /config.status
 /configure
 /dependencies
 /linker_options
+/make_variables
 /modlist_headers
 /modlist_segment
 /module_testsuite
 /stamp-h
 /stamp-h.in
-/config.h
-/config.h.in
diff --git a/src/modules/_Image_JPEG/Makefile.in b/src/modules/_Image_JPEG/Makefile.in
index 68a4515239e8e978cdf077c310f22e5f5c8715fb..c568f0d2324e80bb3611958ffceb1c99f2f129d1 100644
--- a/src/modules/_Image_JPEG/Makefile.in
+++ b/src/modules/_Image_JPEG/Makefile.in
@@ -1,5 +1,5 @@
-# $Id: Makefile.in,v 1.3 1999/04/23 21:42:29 grubba Exp $
-SRCDIR=@srcdir@
+# $Id: Makefile.in,v 1.4 1999/11/18 08:02:05 hubbe Exp $
+@make_variables@
 VPATH=@srcdir@:@srcdir@/../..:../..
 OBJS=image_jpeg.o
 MODULE_LDFLAGS=@LDFLAGS@ @LIBS@
diff --git a/src/modules/_Image_TIFF/.cvsignore b/src/modules/_Image_TIFF/.cvsignore
index 4c4abb584f6d9a7910fed717c046546ed81175a2..a2372d7c307336d535400bae9b3e01c08c39f956 100644
--- a/src/modules/_Image_TIFF/.cvsignore
+++ b/src/modules/_Image_TIFF/.cvsignore
@@ -1,14 +1,15 @@
 .pure
 Makefile
+config.h
+config.h.in 
 config.log
 config.status
 configure
 dependencies
 linker_options
+make_variables
 modlist_headers
 modlist_segment
 module_testsuite
 stamp-h
 stamp-h.in
-config.h
-config.h.in 
diff --git a/src/modules/_Image_TIFF/.gitignore b/src/modules/_Image_TIFF/.gitignore
index e9be9e87737786aa2ee941b8904d5d467fc32258..14854305fb2b6104c4e95c6725c6d86599292015 100644
--- a/src/modules/_Image_TIFF/.gitignore
+++ b/src/modules/_Image_TIFF/.gitignore
@@ -1,14 +1,15 @@
 /.pure
 /Makefile
+/config.h
+/config.h.in
 /config.log
 /config.status
 /configure
 /dependencies
 /linker_options
+/make_variables
 /modlist_headers
 /modlist_segment
 /module_testsuite
 /stamp-h
 /stamp-h.in
-/config.h
-/config.h.in
diff --git a/src/modules/_Image_TIFF/Makefile.in b/src/modules/_Image_TIFF/Makefile.in
index a221a5cbe8ccdc41e6ab33f79a2cf56760d9df87..4b64f3295cb5b6fe041bbae839dc4b2336f0372a 100644
--- a/src/modules/_Image_TIFF/Makefile.in
+++ b/src/modules/_Image_TIFF/Makefile.in
@@ -1,5 +1,5 @@
-# $Id: Makefile.in,v 1.2 1999/04/23 21:42:48 grubba Exp $
-SRCDIR=@srcdir@
+# $Id: Makefile.in,v 1.3 1999/11/18 08:02:16 hubbe Exp $
+@make_variables@
 VPATH=@srcdir@:@srcdir@/../..:../..
 OBJS=image_tiff.o
 MODULE_LDFLAGS=@LDFLAGS@ @LIBS@
diff --git a/src/modules/_Image_TTF/.cvsignore b/src/modules/_Image_TTF/.cvsignore
index ac7a4afa05e6f3de3e509b30484a95562e020ed1..e3d2651bcaa0bb94e694ee5108c59df5bc091b0f 100644
--- a/src/modules/_Image_TTF/.cvsignore
+++ b/src/modules/_Image_TTF/.cvsignore
@@ -6,6 +6,7 @@ config.status
 configure
 dependencies
 linker_options
+make_variables
 modlist_headers
 modlist_segment
 module_testsuite
diff --git a/src/modules/_Image_TTF/.gitignore b/src/modules/_Image_TTF/.gitignore
index 4e3fcaefb48106bfef46464e3aedb63f35582aa0..d843df545ff26024e7c98ff4eb86e5ff9ae8d832 100644
--- a/src/modules/_Image_TTF/.gitignore
+++ b/src/modules/_Image_TTF/.gitignore
@@ -6,6 +6,7 @@
 /configure
 /dependencies
 /linker_options
+/make_variables
 /modlist_headers
 /modlist_segment
 /module_testsuite
diff --git a/src/modules/_Image_TTF/Makefile.in b/src/modules/_Image_TTF/Makefile.in
index 3ead484423a55ee98d73f77992edc769d7ac2266..29db56916252e05a2985e957d2f10bcb0db1ec52 100644
--- a/src/modules/_Image_TTF/Makefile.in
+++ b/src/modules/_Image_TTF/Makefile.in
@@ -1,5 +1,5 @@
-# $Id: Makefile.in,v 1.2 1999/04/23 21:43:49 grubba Exp $
-SRCDIR=@srcdir@
+# $Id: Makefile.in,v 1.3 1999/11/18 08:02:25 hubbe Exp $
+@make_variables@
 VPATH=@srcdir@:@srcdir@/../..:../..
 OBJS=image_ttf.o
 MODULE_LDFLAGS=@LDFLAGS@ @LIBS@
diff --git a/src/modules/_Image_XFace/.cvsignore b/src/modules/_Image_XFace/.cvsignore
index 4c4abb584f6d9a7910fed717c046546ed81175a2..a2372d7c307336d535400bae9b3e01c08c39f956 100644
--- a/src/modules/_Image_XFace/.cvsignore
+++ b/src/modules/_Image_XFace/.cvsignore
@@ -1,14 +1,15 @@
 .pure
 Makefile
+config.h
+config.h.in 
 config.log
 config.status
 configure
 dependencies
 linker_options
+make_variables
 modlist_headers
 modlist_segment
 module_testsuite
 stamp-h
 stamp-h.in
-config.h
-config.h.in 
diff --git a/src/modules/_Image_XFace/.gitignore b/src/modules/_Image_XFace/.gitignore
index e9be9e87737786aa2ee941b8904d5d467fc32258..14854305fb2b6104c4e95c6725c6d86599292015 100644
--- a/src/modules/_Image_XFace/.gitignore
+++ b/src/modules/_Image_XFace/.gitignore
@@ -1,14 +1,15 @@
 /.pure
 /Makefile
+/config.h
+/config.h.in
 /config.log
 /config.status
 /configure
 /dependencies
 /linker_options
+/make_variables
 /modlist_headers
 /modlist_segment
 /module_testsuite
 /stamp-h
 /stamp-h.in
-/config.h
-/config.h.in
diff --git a/src/modules/_Image_XFace/Makefile.in b/src/modules/_Image_XFace/Makefile.in
index c38cdd849124a713a9956c5b6959f1c1d55623d5..393e8fcf2eb39c1c7534eb008ea39800252f3489 100644
--- a/src/modules/_Image_XFace/Makefile.in
+++ b/src/modules/_Image_XFace/Makefile.in
@@ -1,5 +1,5 @@
-# $Id: Makefile.in,v 1.3 1999/04/23 21:44:11 grubba Exp $
-SRCDIR=@srcdir@
+# $Id: Makefile.in,v 1.4 1999/11/18 08:02:34 hubbe Exp $
+@make_variables@
 VPATH=@srcdir@:@srcdir@/../..:../..
 OBJS=image_xface.o
 MODULE_LDFLAGS=@LDFLAGS@ @LIBS@
diff --git a/src/modules/_math/.cvsignore b/src/modules/_math/.cvsignore
index 046e7b953fe51d88f9ef15930ba1d92fd8dcb138..e782600f54b6dda9cc8b5d1b85b4ba0b49c8b46c 100644
--- a/src/modules/_math/.cvsignore
+++ b/src/modules/_math/.cvsignore
@@ -7,6 +7,7 @@ config.status
 configure
 dependencies
 linker_options
+make_variables
 modlist_headers
 modlist_segment
 module.pmod
diff --git a/src/modules/_math/.gitignore b/src/modules/_math/.gitignore
index 5251a94d2b84f4d4c76fa7252a46649aa1d9467f..90415d1dab6a2687456332ec3082a79a474fb8db 100644
--- a/src/modules/_math/.gitignore
+++ b/src/modules/_math/.gitignore
@@ -7,6 +7,7 @@
 /configure
 /dependencies
 /linker_options
+/make_variables
 /modlist_headers
 /modlist_segment
 /module.pmod
diff --git a/src/modules/_math/Makefile.in b/src/modules/_math/Makefile.in
index 51608f5bda001c711b64c7c50c9848b2332bb087..c0438202cf4f1cd92e456d802da9aa05bb2c510e 100644
--- a/src/modules/_math/Makefile.in
+++ b/src/modules/_math/Makefile.in
@@ -1,5 +1,5 @@
-# $Id: Makefile.in,v 1.6 1999/04/23 21:45:17 grubba Exp $
-SRCDIR=@srcdir@
+# $Id: Makefile.in,v 1.7 1999/11/18 08:02:42 hubbe Exp $
+@make_variables@
 VPATH=@srcdir@:@srcdir@/../..:../..
 MODULE_LDFLAGS=@LIBS@
 OBJS=math.o
diff --git a/src/modules/call_out/.cvsignore b/src/modules/call_out/.cvsignore
index 046e7b953fe51d88f9ef15930ba1d92fd8dcb138..e782600f54b6dda9cc8b5d1b85b4ba0b49c8b46c 100644
--- a/src/modules/call_out/.cvsignore
+++ b/src/modules/call_out/.cvsignore
@@ -7,6 +7,7 @@ config.status
 configure
 dependencies
 linker_options
+make_variables
 modlist_headers
 modlist_segment
 module.pmod
diff --git a/src/modules/call_out/.gitignore b/src/modules/call_out/.gitignore
index 5251a94d2b84f4d4c76fa7252a46649aa1d9467f..90415d1dab6a2687456332ec3082a79a474fb8db 100644
--- a/src/modules/call_out/.gitignore
+++ b/src/modules/call_out/.gitignore
@@ -7,6 +7,7 @@
 /configure
 /dependencies
 /linker_options
+/make_variables
 /modlist_headers
 /modlist_segment
 /module.pmod
diff --git a/src/modules/call_out/Makefile.in b/src/modules/call_out/Makefile.in
index f749109fc582eb1c44f0dbe78a4bf7669c3a0071..514087802e49239c6a7910afc2858172a4a70698 100644
--- a/src/modules/call_out/Makefile.in
+++ b/src/modules/call_out/Makefile.in
@@ -1,5 +1,5 @@
-# $Id: Makefile.in,v 1.7 1999/04/23 21:44:34 grubba Exp $
-SRCDIR=@srcdir@
+# $Id: Makefile.in,v 1.8 1999/11/18 08:02:51 hubbe Exp $
+@make_variables@
 VPATH=@srcdir@:@srcdir@/../..:../..
 OBJS=call_out.o
 MODULE_LDFLAGS=@LIBS@
diff --git a/src/modules/files/.cvsignore b/src/modules/files/.cvsignore
index a5908ad49c7b5d8935ca8a8913c99dbd44c0c953..38083cc6c11ce332f3ee21e6ed4104c37f30927d 100644
--- a/src/modules/files/.cvsignore
+++ b/src/modules/files/.cvsignore
@@ -7,6 +7,7 @@ dependencies
 file_machine.h
 file_machine.h.in
 linker_options
+make_variables
 modlist_headers
 modlist_segment
 module.pmod
diff --git a/src/modules/files/.gitignore b/src/modules/files/.gitignore
index 24404cbc9bc752db05324edaeda849727ef3cb43..dfaa59e66a42fa2dca858a4d5a0f192a09fd6d92 100644
--- a/src/modules/files/.gitignore
+++ b/src/modules/files/.gitignore
@@ -7,6 +7,7 @@
 /file_machine.h
 /file_machine.h.in
 /linker_options
+/make_variables
 /modlist_headers
 /modlist_segment
 /module.pmod
diff --git a/src/modules/files/Makefile.in b/src/modules/files/Makefile.in
index 9a793bbd59516f317fad3870d04789dda86b863b..d71cf830c777da9412ceb87fdb63a50b5c935a9d 100644
--- a/src/modules/files/Makefile.in
+++ b/src/modules/files/Makefile.in
@@ -1,5 +1,5 @@
-# $Id: Makefile.in,v 1.10 1999/07/15 17:36:33 mirar Exp $
-SRCDIR=@srcdir@
+# $Id: Makefile.in,v 1.11 1999/11/18 08:02:59 hubbe Exp $
+@make_variables@
 VPATH=@srcdir@:@srcdir@/../..:../..
 OBJS=file.o efuns.o socket.o termios.o sendfile.o udp.o
 MODULE_LDFLAGS=@LIBS@
diff --git a/src/modules/spider/.cvsignore b/src/modules/spider/.cvsignore
index c03762d717653c9df416281efa7e6ae71b1e97ae..d45d29b97f067ce44f41aee72b02b7925026aac8 100644
--- a/src/modules/spider/.cvsignore
+++ b/src/modules/spider/.cvsignore
@@ -7,6 +7,7 @@ config.status
 configure
 dependencies
 linker_options
+make_variables
 modlist_headers
 modlist_segment
 module_testsuite
diff --git a/src/modules/spider/.gitignore b/src/modules/spider/.gitignore
index a5518ba7a2885a895e1d26ee9978ea4a44703cff..14854305fb2b6104c4e95c6725c6d86599292015 100644
--- a/src/modules/spider/.gitignore
+++ b/src/modules/spider/.gitignore
@@ -7,6 +7,7 @@
 /configure
 /dependencies
 /linker_options
+/make_variables
 /modlist_headers
 /modlist_segment
 /module_testsuite
diff --git a/src/modules/spider/Makefile.in b/src/modules/spider/Makefile.in
index ee9978d8b41eb1e0bf4218d665261293ad72d98d..54982a1eef082b8173f13117e7e021dd90c6f37e 100644
--- a/src/modules/spider/Makefile.in
+++ b/src/modules/spider/Makefile.in
@@ -1,5 +1,5 @@
-# $Id: Makefile.in,v 1.18 1999/07/21 18:39:29 grubba Exp $
-SRCDIR=@srcdir@
+# $Id: Makefile.in,v 1.19 1999/11/18 08:03:08 hubbe Exp $
+@make_variables@
 VPATH=@srcdir@:@srcdir@/../..:../..
 OBJS=spider.o discdate.o stardate.o xml.o
 MODULE_LDFLAGS=@LDFLAGS@
diff --git a/src/modules/sprintf/.cvsignore b/src/modules/sprintf/.cvsignore
index 046e7b953fe51d88f9ef15930ba1d92fd8dcb138..e782600f54b6dda9cc8b5d1b85b4ba0b49c8b46c 100644
--- a/src/modules/sprintf/.cvsignore
+++ b/src/modules/sprintf/.cvsignore
@@ -7,6 +7,7 @@ config.status
 configure
 dependencies
 linker_options
+make_variables
 modlist_headers
 modlist_segment
 module.pmod
diff --git a/src/modules/sprintf/.gitignore b/src/modules/sprintf/.gitignore
index 5251a94d2b84f4d4c76fa7252a46649aa1d9467f..90415d1dab6a2687456332ec3082a79a474fb8db 100644
--- a/src/modules/sprintf/.gitignore
+++ b/src/modules/sprintf/.gitignore
@@ -7,6 +7,7 @@
 /configure
 /dependencies
 /linker_options
+/make_variables
 /modlist_headers
 /modlist_segment
 /module.pmod
diff --git a/src/modules/sprintf/Makefile.in b/src/modules/sprintf/Makefile.in
index 19802351976559f7f386e9d9ebd1970e7de4557f..cd5a8be0e86001c40a41cbeae7e72b2da67d95e5 100644
--- a/src/modules/sprintf/Makefile.in
+++ b/src/modules/sprintf/Makefile.in
@@ -1,5 +1,5 @@
-# $Id: Makefile.in,v 1.7 1999/04/23 21:46:08 grubba Exp $
-SRCDIR=@srcdir@
+# $Id: Makefile.in,v 1.8 1999/11/18 08:03:18 hubbe Exp $
+@make_variables@
 VPATH=@srcdir@:@srcdir@/../..:../..
 OBJS=sprintf.o
 MODULE_LDFLAGS=@LDFLAGS@
diff --git a/src/modules/system/.cvsignore b/src/modules/system/.cvsignore
index b5760cc263fd556b11d68b964501e941696e34a9..e549ef5a9b5002e13e139e9daf3536017232945a 100644
--- a/src/modules/system/.cvsignore
+++ b/src/modules/system/.cvsignore
@@ -1,10 +1,12 @@
 .pure
 Makefile
+add-errnos.h
 config.log
 config.status
 configure
 dependencies
 linker_options
+make_variables
 modlist_headers
 modlist_segment
 module.pmod
@@ -13,4 +15,3 @@ stamp-h
 stamp-h.in
 system_machine.h
 system_machine.h.in
-add-errnos.h
diff --git a/src/modules/system/.gitignore b/src/modules/system/.gitignore
index 5096427aa03db9fcd6cd2837d0a2f84e65a75c6f..c6f829995c59832208fe7f6873452ebf50afcd9b 100644
--- a/src/modules/system/.gitignore
+++ b/src/modules/system/.gitignore
@@ -1,10 +1,12 @@
 /.pure
 /Makefile
+/add-errnos.h
 /config.log
 /config.status
 /configure
 /dependencies
 /linker_options
+/make_variables
 /modlist_headers
 /modlist_segment
 /module.pmod
@@ -13,4 +15,3 @@
 /stamp-h.in
 /system_machine.h
 /system_machine.h.in
-/add-errnos.h
diff --git a/src/modules/system/Makefile.in b/src/modules/system/Makefile.in
index 53613013184fa144ae9743c2ee17a52d08129f99..82609be4e44122fc12d3f12954cedc2659d3ef7b 100644
--- a/src/modules/system/Makefile.in
+++ b/src/modules/system/Makefile.in
@@ -1,5 +1,5 @@
-# $Id: Makefile.in,v 1.8 1999/04/23 21:46:27 grubba Exp $
-SRCDIR=@srcdir@
+# $Id: Makefile.in,v 1.9 1999/11/18 08:03:26 hubbe Exp $
+@make_variables@
 VPATH=@srcdir@:@srcdir@/../..:../..:.
 OBJS=system.o syslog.o passwords.o nt.o
 MODULE_LDFLAGS=@LIBS@
diff --git a/src/post_modules/.cvsignore b/src/post_modules/.cvsignore
index 6eb32af830e0237938d792b3e948f30ade81af74..3bab8a5b51147ba70e2b590ec0a85640157fc785 100644
--- a/src/post_modules/.cvsignore
+++ b/src/post_modules/.cvsignore
@@ -6,6 +6,7 @@ dependencies
 dynamic_module_makefile
 lib_dirs
 linker_options
+make_variables
 master_lib_dirs
 modlist.h
 modlist_headers.h
diff --git a/src/post_modules/.gitignore b/src/post_modules/.gitignore
index b5b99d53dcc6bf2160f692fa0c7493d928d443d6..c9cbf8546e247f0df198ac4dfad4042756489927 100644
--- a/src/post_modules/.gitignore
+++ b/src/post_modules/.gitignore
@@ -6,6 +6,7 @@
 /dynamic_module_makefile
 /lib_dirs
 /linker_options
+/make_variables
 /master_lib_dirs
 /modlist.h
 /modlist_headers.h
diff --git a/src/post_modules/GL/.cvsignore b/src/post_modules/GL/.cvsignore
index ae2922eca1e0f8b1736b98ea944d7ec2143be3b4..eddc272108726152bf2a84700ca418d895a9897e 100644
--- a/src/post_modules/GL/.cvsignore
+++ b/src/post_modules/GL/.cvsignore
@@ -1,16 +1,17 @@
 .pure
 Makefile
+auto.c
+config.cache
 config.h
 config.h.in
 config.log
-config.cache
 config.status
 configure
 dependencies
 linker_options
+make_variables
 modlist_headers
 modlist_segment
 module_testsuite
 stamp-h
 stamp-h.in
-auto.c
diff --git a/src/post_modules/GL/.gitignore b/src/post_modules/GL/.gitignore
index 1d89051b2fe29636d48ba8d7518b581aa4b5234c..19e622c6bfeab39947effe93954b98da99b7e6a6 100644
--- a/src/post_modules/GL/.gitignore
+++ b/src/post_modules/GL/.gitignore
@@ -1,16 +1,17 @@
 /.pure
 /Makefile
+/auto.c
+/config.cache
 /config.h
 /config.h.in
 /config.log
-/config.cache
 /config.status
 /configure
 /dependencies
 /linker_options
+/make_variables
 /modlist_headers
 /modlist_segment
 /module_testsuite
 /stamp-h
 /stamp-h.in
-/auto.c
diff --git a/src/post_modules/GL/Makefile.in b/src/post_modules/GL/Makefile.in
index 9e1d8d1853ef3822f4a9aaa6a5204ed46319d86a..9bac59a06ce7feef645ea893e1911a95f7be4cab 100644
--- a/src/post_modules/GL/Makefile.in
+++ b/src/post_modules/GL/Makefile.in
@@ -1,5 +1,5 @@
-# $Id: Makefile.in,v 1.5 1999/11/15 19:13:10 neotron Exp $
-SRCDIR=@srcdir@
+# $Id: Makefile.in,v 1.6 1999/11/18 08:03:44 hubbe Exp $
+@make_variables@
 VPATH=@srcdir@:@srcdir@/../..:../..
 OBJS=top.o @AUTO_OBJS@
 MODULE_LDFLAGS=@LDFLAGS@ @LIBS@
diff --git a/src/post_modules/GLUT/.cvsignore b/src/post_modules/GLUT/.cvsignore
index ae2922eca1e0f8b1736b98ea944d7ec2143be3b4..eddc272108726152bf2a84700ca418d895a9897e 100644
--- a/src/post_modules/GLUT/.cvsignore
+++ b/src/post_modules/GLUT/.cvsignore
@@ -1,16 +1,17 @@
 .pure
 Makefile
+auto.c
+config.cache
 config.h
 config.h.in
 config.log
-config.cache
 config.status
 configure
 dependencies
 linker_options
+make_variables
 modlist_headers
 modlist_segment
 module_testsuite
 stamp-h
 stamp-h.in
-auto.c
diff --git a/src/post_modules/GLUT/.gitignore b/src/post_modules/GLUT/.gitignore
index 1d89051b2fe29636d48ba8d7518b581aa4b5234c..19e622c6bfeab39947effe93954b98da99b7e6a6 100644
--- a/src/post_modules/GLUT/.gitignore
+++ b/src/post_modules/GLUT/.gitignore
@@ -1,16 +1,17 @@
 /.pure
 /Makefile
+/auto.c
+/config.cache
 /config.h
 /config.h.in
 /config.log
-/config.cache
 /config.status
 /configure
 /dependencies
 /linker_options
+/make_variables
 /modlist_headers
 /modlist_segment
 /module_testsuite
 /stamp-h
 /stamp-h.in
-/auto.c
diff --git a/src/post_modules/GLUT/Makefile.in b/src/post_modules/GLUT/Makefile.in
index 7d055c5ac52d9410c6b013fda61ff2ccaf3337ba..c0ff4f7727863e3e90b7167af296227ab4330547 100644
--- a/src/post_modules/GLUT/Makefile.in
+++ b/src/post_modules/GLUT/Makefile.in
@@ -1,5 +1,5 @@
-# $Id: Makefile.in,v 1.2 1999/11/15 19:29:55 neotron Exp $
-SRCDIR=@srcdir@
+# $Id: Makefile.in,v 1.3 1999/11/18 08:03:52 hubbe Exp $
+@make_variables@
 VPATH=@srcdir@:@srcdir@/../..:../..
 OBJS=top.o @AUTO@
 MODULE_LDFLAGS=@LDFLAGS@ @LIBS@
diff --git a/src/post_modules/GTK/.cvsignore b/src/post_modules/GTK/.cvsignore
index 2ec10f927057a2667055b906b45d49b212bb68aa..bf932d0bfd656ac65c5b0e0cab20dc450ad1054c 100755
--- a/src/post_modules/GTK/.cvsignore
+++ b/src/post_modules/GTK/.cvsignore
@@ -11,8 +11,10 @@ configure
 docs
 files_to_compile
 linker_options
+make_variables
 modlist_headers
 modlist_segment
 options
 prototypes.h
+sources
 stamp-h.in
diff --git a/src/post_modules/GTK/.gitignore b/src/post_modules/GTK/.gitignore
index d984c302b4bcbbbe93594056da95be6743894d91..026230ba14c9a1b2f8fb8a4e1afabdb94c6dac8f 100755
--- a/src/post_modules/GTK/.gitignore
+++ b/src/post_modules/GTK/.gitignore
@@ -11,8 +11,10 @@
 /docs
 /files_to_compile
 /linker_options
+/make_variables
 /modlist_headers
 /modlist_segment
 /options
 /prototypes.h
+/sources
 /stamp-h.in
diff --git a/src/post_modules/GTK/Makefile.in b/src/post_modules/GTK/Makefile.in
index f2780335a242055f9b7ab5e6cbfe7afc801df1b9..4fa7306a13c5e1da49f30a488f5755d644640dfe 100644
--- a/src/post_modules/GTK/Makefile.in
+++ b/src/post_modules/GTK/Makefile.in
@@ -1,5 +1,5 @@
 # This line is needed on some machines.
-SRCDIR=@srcdir@
+@make_variables@
 VPATH=@srcdir@:@srcdir@/../..:../..:.
 MODNAME=GTK
 DEST=@prefix@/lib/pike/modules/
diff --git a/src/post_modules/Makefile.in b/src/post_modules/Makefile.in
index be7a52908b5146f3bf8c480bc1829e6893ed2ed3..3ad8ca3fbf02fb2b5fcb162d98c2c5af45fc64e8 100644
--- a/src/post_modules/Makefile.in
+++ b/src/post_modules/Makefile.in
@@ -1,18 +1,11 @@
-# $Id: Makefile.in,v 1.1 1999/11/07 01:33:42 per Exp $
+# $Id: Makefile.in,v 1.2 1999/11/18 08:03:35 hubbe Exp $
 
-@SET_MAKE@
-
-CC=@CC@
-CPP=@CPP@
-SRCDIR=@srcdir@
-AR=@AR@
+@make_variables@
 
 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)" LDFLAGS="$(LDFLAGS)" "CC=$(CC)" "MAKE=$(MAKE)" "NOOPTFLAGS=$(NOOPTFLAGS)"
-
 all: linker_options modlist.h modlist_headers.h
 
 $(MODULE_SEGMENTS) $(MODULE_LINKOPTS): modules