Merge /u/kotaro-tokai/perfmon2/ branch monaka-v1.1-support into master
https://sourceforge.net/p/perfmon2/libpfm4/merge-requests/35/
diff --git a/python/Makefile b/python/Makefile
index d286bd4..58cf8d0 100644
--- a/python/Makefile
+++ b/python/Makefile
@@ -28,11 +28,12 @@
PYTHON_PREFIX=$(PREFIX)
all:
- CFLAGS="-O2 -g" ./setup.py build
+ CFLAGS="-O2 -g" python3 setup.py build
install:
- CFLAGS="-O2 -g" ./setup.py install --prefix=$(DESTDIR)$(PYTHON_PREFIX)
+ CFLAGS="-O2 -g" python3 -m pip install \
+ --prefix=$(DESTDIR)$(PYTHON_PREFIX) .
clean:
$(RM) src/perfmon_int_wrap.c src/perfmon_int.py src/*.pyc
- $(RM) -r build
+ $(RM) -r build perfmon.egg-info
diff --git a/python/README b/python/README
index 18da891..97398c8 100644
--- a/python/README
+++ b/python/README
@@ -6,3 +6,4 @@
2. python-dev (http://www.python.org)
3. module-linux (http://code.google.com/p/module-linux)
linux.sched is python package that comes with module-linux.
+4. python3-setuptools (https://pypi.org/project/setuptools/)
diff --git a/python/src/__init__.py b/python/src/__init__.py
index 8f29366..68ac698 100644
--- a/python/src/__init__.py
+++ b/python/src/__init__.py
@@ -1,5 +1,5 @@
-from perfmon_int import *
-from pmu import *
-from session import *
+from .perfmon_int import *
+from .pmu import *
+from .session import *
pfm_initialize()
