correct sys prefix in Makefile
authorGui Chen <gui.chen@intel.com>
Wed, 2 May 2012 05:49:35 +0000 (13:49 +0800)
committerGui Chen <gui.chen@intel.com>
Wed, 2 May 2012 05:49:35 +0000 (13:49 +0800)
and correct join path for mic.conf

Signed-off-by: Gui Chen <gui.chen@intel.com>
Makefile
mic/conf.py

index ccacabd..cf34fc8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ else
 endif
 
 ifndef PREFIX
-    PREFIX = "/usr"
+    PREFIX = $(shell $(PYTHON) -c "import sys;print sys.prefix")
 endif
 
 all: build
index 951a5b8..47b5314 100644 (file)
@@ -29,7 +29,7 @@ def get_siteconf():
 
     m = re.match(r"(?P<prefix>.*)\/lib(64)?\/.*", mic_path)
     if m and m.group('prefix') != "/usr":
-        return os.path.join(m.group('prefix'), DEFAULT_GSITECONF)
+        return os.path.join(m.group('prefix'), "etc/mic/mic.conf")
 
     return DEFAULT_GSITECONF