trace-cmd: Add PLYTHON_DIR to search path for the python plugins

Automate the loading of the PYTHON_DIR to tell the plugins where to
load the trace-cmd specific modules.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

2 files changed, 10 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index ad2d708..a1096f2 100644
--- a/Makefile
+++ b/Makefile
@@ -487,15 +487,17 @@ python-gui: ctracecmd.so ctracecmdgui.so
 PHONY += python-plugin
 python-plugin: plugin_python.so python
 
+CFLAGS_plugin_python.o += $(PYTHON_DIR_SQ)
+
 do_compile_python_plugin_obj =                  \
         ($(print_plugin_obj_compile)            \
-        $(CC) -c $(CFLAGS) $(PYTHON_INCLUDES) -fPIC -o $@ $<)
+        $(CC) -c $(CFLAGS) $(CFLAGS_$@) $(PYTHON_INCLUDES) -fPIC -o $@ $<)
 
 do_python_plugin_build =                        \
         ($(print_plugin_build)                  \
         $(CC) -shared $(PYTHON_LDFLAGS) -o $@ $<)
 
-plugin_python.o: %.o : $(src)/%.c
+plugin_python.o: %.o : $(src)/%.c trace_python_dir
         $(Q)$(do_compile_python_plugin_obj)
 
 plugin_python.so: %.so: %.o
diff --git a/plugin_python.c b/plugin_python.c
index dada5dc..0f52bb3 100644
--- a/plugin_python.c
+++ b/plugin_python.c
@@ -2,7 +2,13 @@
 #include <stdio.h>
 #include "trace-cmd.h"
 
+#ifndef PYTHON_DIR
+#define PYTHON_DIR .
+#endif
+
 static const char pyload[] =
+"import sys\n"
+"sys.path.append(\"" MAKE_STR(PYTHON_DIR) "\")\n"
 "import imp, tracecmd, ctracecmd\n"
 "fn = r'%s'\n"
 "file = open(fn, 'r')\n"