Branch: Tag:

1999-06-02

1999-06-02 21:21:39 by Marcus Comstedt <marcus@mc.pp.se>

Fixed registry-stuff for NT.

Rev: lib/master.pike.in:1.50
Rev: src/main.c:1.73

1: - /* $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:    }       + #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:    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]);