diff --git a/lib/master.pike.in b/lib/master.pike.in
index f373567c3e0f605aa3f893cb5608d3c1a85391e7..251127c9b4c6ca9bcecec9d18fd113c2a96c3889 100644
--- a/lib/master.pike.in
+++ b/lib/master.pike.in
@@ -1,4 +1,4 @@
-/* $Id: master.pike.in,v 1.29 1998/05/19 20:39:20 hubbe Exp $
+/* $Id: master.pike.in,v 1.30 1998/05/27 22:49:37 hubbe Exp $
  * 
  * Master-file for Pike.
  *
@@ -559,21 +559,21 @@ void _main(string *orig_argv, string *env)
 
   foreach(env,a) if(sscanf(a,"%s=%s",a,b)) environment[a]=b;
 
-#ifdef __NT__
+#if defined(__NT__) && !defined(NOT_INSTALLED)
   function rget=lambda(string ent) {
    return
      RegGetValue(HKEY_CURRENT_USER,"SOFTWARE\\Idonex\\Pike\\0.6",ent) ||
      RegGetValue(HKEY_LOCAL_MACHINE,"SOFTWARE\\Idonex\\Pike\\0.6",ent) ;
  };
-  string tmp=rget("share_prefix");
+  string tmppath=rget("share_prefix");
   // add path for architecture-shared files
-  add_include_path(tmp+"/include");
-  add_module_path(tmp+"/modules");
+  add_include_path(tmppath+"/include");
+  add_module_path(tmppath+"/modules");
 
   string tmp=rget("lib_prefix");
   // add path for architecture-dependant files
-  add_include_path(tmp+"/include");
-  add_module_path(tmp+"/modules");
+  add_include_path(tmppath+"/include");
+  add_module_path(tmppath+"/modules");
 #else
   // add path for architecture-shared files
   add_include_path("¤share_prefix¤/include");
diff --git a/src/Makefile.in b/src/Makefile.in
index 04c2904471248e18a6937ef25eef84b645ae75f2..37eadae3efcd745b45d05494c738b443d07d6463 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.in,v 1.92 1998/05/22 16:49:17 grubba Exp $
+# $Id: Makefile.in,v 1.93 1998/05/27 22:55:18 hubbe Exp $
 #
 
 # This line is needed on some machines.
@@ -73,7 +73,7 @@ AR=@AR@
 LD=@LD@
 LDFLAGS=$(CFLAGS) @LDFLAGS@ @LINKFORSHARED@
 
-RUNPIKE=$(TMP_BUILDDIR)/pike -m$(TMP_BUILDDIR)/master.pike $(PIKEOPTS)
+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)"