diff --git a/bin/install.pike b/bin/install.pike
index 99cd7f3936bc901ec27fcd97d2ff0fb878e25f8f..8c7b4a84b0fec2c182997175c466029436f7e027 100644
--- a/bin/install.pike
+++ b/bin/install.pike
@@ -2,7 +2,7 @@
 
 // Pike installer and exporter.
 //
-// $Id: install.pike,v 1.176 2007/04/07 10:52:37 grubba Exp $
+// $Id: install.pike,v 1.177 2007/07/29 16:11:47 peter Exp $
 
 #define USE_GTK
 
@@ -2696,8 +2696,8 @@ the PRIVATE_CRT stuff in install.pike.\n");
 		       combine_path(include_prefix, "specs"));
       low_install_file(combine_path(vars->TMP_BUILDDIR,
 				    "modules/dynamic_module_makefile"),
-		       combine_path(include_prefix,
-				    "dynamic_module_makefile"));
+		       combine_path(include_prefix, 
+				    "modules/dynamic_module_makefile"));
       low_install_file(combine_path(vars->SRCDIR,"install-welcome"),
 		       combine_path(prefix, "build/install-welcome"));
       low_install_file(combine_path(vars->SRCDIR,"dumpmaster.pike"),
@@ -2765,9 +2765,11 @@ the PRIVATE_CRT stuff in install.pike.\n");
 		   combine_path(include_prefix,f));
 
     if(!export) {
+      mkdirhier(combine_path(include_prefix, "modules"));
       fix_smartlink(combine_path(vars->TMP_BUILDDIR,
 				 "modules/dynamic_module_makefile"),
-		    combine_path(include_prefix,"dynamic_module_makefile"),
+		    combine_path(include_prefix,
+				 "modules/dynamic_module_makefile"),
 		    include_prefix);
       fix_smartlink(combine_path(vars->TMP_BUILDDIR,"specs"),
 		    combine_path(include_prefix,"specs"), include_prefix);
diff --git a/lib/modules/Tools.pmod/Standalone.pmod/module.pike b/lib/modules/Tools.pmod/Standalone.pmod/module.pike
index cf66a490fbe854cacd309b98ad5ed7bde194fbe4..f6aaa1a48f6d8df7ac35c1e073c0d57458b60385 100644
--- a/lib/modules/Tools.pmod/Standalone.pmod/module.pike
+++ b/lib/modules/Tools.pmod/Standalone.pmod/module.pike
@@ -1,10 +1,10 @@
 // -*- Pike -*-
 
-// $Id: module.pike,v 1.25 2006/04/22 13:59:30 grubba Exp $
+// $Id: module.pike,v 1.26 2007/07/29 16:11:47 peter Exp $
 
 #pike __REAL_VERSION__
 
-constant version = ("$Revision: 1.25 $"/" ")[1];
+constant version = ("$Revision: 1.26 $"/" ")[1];
 constant description = "Pike module installer.";
 
 // Source directory
@@ -163,11 +163,7 @@ void do_make(array(string) cmd)
     ({"PIKE_INCLUDES=-I"+include_path,
       "PIKE_SRC_DIR="+src_path,
       "BUILD_BASE="+include_path,
-#ifdef NOT_INSTALLED
       "MODULE_BASE="+include_path+"/modules",
-#else
-      "MODULE_BASE="+include_path,
-#endif
       "TMP_BINDIR="+bin_path,
       "SRCDIR="+fix("$src"),
       "FULL_SRCDIR=" + full_srcdir,