From 624e85846dda19c3ae85ed367e3742d6bc24ad41 Mon Sep 17 00:00:00 2001
From: Marcus Comstedt <marcus@mc.pp.se>
Date: Wed, 2 Jun 1999 23:21:39 +0200
Subject: [PATCH] Fixed registry-stuff for NT.
Rev: lib/master.pike.in:1.50
Rev: src/main.c:1.73
---
lib/master.pike.in | 22 +++++++++++++++++++++-
src/main.c | 4 ++--
2 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/lib/master.pike.in b/lib/master.pike.in
index 9f9c781920..ffbc5a8bac 100644
--- a/lib/master.pike.in
+++ b/lib/master.pike.in
@@ -1,4 +1,4 @@
-/* $Id: master.pike.in,v 1.49 1999/06/01 12:12:11 mirar Exp $
+/* $Id: master.pike.in,v 1.50 1999/06/02 21:21:39 marcus Exp $
*
* Master-file for Pike.
*
@@ -722,6 +722,24 @@ void _main(string *orig_argv, string *env)
}
+#if defined(__NT__) && !defined(NOT_INSTALLED)
+ function rget=lambda(string ent) {
+ catch { return RegGetValue(HKEY_CURRENT_USER,"SOFTWARE\\Idonex\\Pike\\0.7",ent); };
+ catch { return RegGetValue(HKEY_LOCAL_MACHINE,"SOFTWARE\\Idonex\\Pike\\0.7",ent); };
+
+ };
+ string tmppath=rget("share_prefix");
+ // add path for architecture-shared files
+ add_include_path(tmppath+"/include");
+ add_module_path(tmppath+"/modules");
+
+ tmppath=rget("lib_prefix");
+ // add path for architecture-dependant files
+ add_include_path(tmppath+"/include");
+ add_module_path(tmppath+"/modules");
+
+#else
+
#if "�share_prefix�"[0]!='�'
// add path for architecture-dependant files
add_include_path("�share_prefix�/include");
@@ -734,6 +752,8 @@ void _main(string *orig_argv, string *env)
add_module_path("�lib_prefix�/modules");
#endif
+#endif
+
#ifndef NOT_INSTALLED
q=(getenv("PIKE_INCLUDE_PATH")||"")/":"-({""});
for(i=sizeof(q)-1;i>=0;i--) add_include_path(q[i]);
diff --git a/src/main.c b/src/main.c
index 7676063810..fba0910893 100644
--- a/src/main.c
+++ b/src/main.c
@@ -5,7 +5,7 @@
\*/
/**/
#include "global.h"
-RCSID("$Id: main.c,v 1.72 1999/05/08 00:38:42 hubbe Exp $");
+RCSID("$Id: main.c,v 1.73 1999/06/02 21:21:38 marcus Exp $");
#include "fdlib.h"
#include "backend.h"
#include "module.h"
@@ -105,7 +105,7 @@ static void get_master_key(long cat)
DWORD len=sizeof(buffer)-1,type=REG_SZ;
long ret;
if(RegOpenKeyEx(cat,
- (LPCTSTR)"SOFTWARE\\Idonex\\Pike\\0.6",
+ (LPCTSTR)"SOFTWARE\\Idonex\\Pike\\0.7",
0,KEY_READ,&k)==ERROR_SUCCESS)
{
if(RegQueryValueEx(k,
--
GitLab