renamed babelcmd to nimblecmd; config files are now nim.cfg; other renamings

1 files changed, 5 insertions, 4 deletions

diff --git a/compiler/nimconf.nim b/compiler/nimconf.nim
index d23c7f1be..98fe831d3 100644
--- a/compiler/nimconf.nim
+++ b/compiler/nimconf.nim
@@ -224,8 +224,8 @@ proc loadConfigs*(cfg: string) =
   if libpath == "": 
     # choose default libpath:
     var prefix = getPrefixDir()
-    if prefix == "/usr": libpath = "/usr/lib/nimrod"
-    elif prefix == "/usr/local": libpath = "/usr/local/lib/nimrod"
+    if prefix == "/usr": libpath = "/usr/lib/nim"
+    elif prefix == "/usr/local": libpath = "/usr/local/lib/nim"
     else: libpath = joinPath(prefix, "lib")
 
   if optSkipConfigFile notin gGlobalOptions:
@@ -244,5 +244,6 @@ proc loadConfigs*(cfg: string) =
     
     if gProjectName.len != 0:
       # new project wide config file:
-      readConfigFile(changeFileExt(gProjectFull, "nimrod.cfg"))
- 
+      let projectConfig = changeFileExt(gProjectFull, "nim.cfg")
+      if fileExists(projectConfig): readConfigFile(projectConfig)
+      else: readConfigFile(changeFileExt(gProjectFull, "nimrod.cfg"))