summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGui Chen <gui.chen@intel.com>2012-05-02 13:49:35 +0800
committerGui Chen <gui.chen@intel.com>2012-05-02 13:49:35 +0800
commitd311fb0bef27f23938c35ea250b12988d8fc9e9d (patch)
tree0364e17a12ed71d8d9f6f79eb9623b7e9d45b5a6
parentdf0288a28bdff48910055dd3f54c1d5d4d89106a (diff)
downloadmic-d311fb0bef27f23938c35ea250b12988d8fc9e9d.tar.gz
mic-d311fb0bef27f23938c35ea250b12988d8fc9e9d.tar.bz2
mic-d311fb0bef27f23938c35ea250b12988d8fc9e9d.zip
correct sys prefix in Makefile
and correct join path for mic.conf Signed-off-by: Gui Chen <gui.chen@intel.com>
-rw-r--r--Makefile2
-rw-r--r--mic/conf.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index ccacabd..cf34fc8 100644
--- 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
diff --git a/mic/conf.py b/mic/conf.py
index 951a5b8..47b5314 100644
--- a/mic/conf.py
+++ b/mic/conf.py
@@ -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