From 317560cc5544f8ca8286ba5ecedd8236746e9ebf Mon Sep 17 00:00:00 2001 From: Emmanuel Dreyfus Date: Thu, 7 May 2015 12:39:05 +0200 Subject: glupy: fix tuntime search path and python module directory layout 1) The glupy.so xlator should embed the runtime search path for the python libraries. Unfortunately, python-config does not gives the appprioate flags, therefore we need to also use pkg-config to obtain them 2) Fix the glupy python module directory layout so that python can import the module without problem That two fixes seems to let glupy.t pass on NetBSD again. BUG: 1129939 Change-Id: I397aa726ab8bf7d91fa0d6d870a30910a5f4a5d9 Signed-off-by: Emmanuel Dreyfus Reviewed-on: http://review.gluster.org/10616 Tested-by: Gluster Build System Reviewed-by: Jeff Darcy Reviewed-by: Kaleb KEITHLEY --- xlators/features/glupy/src/Makefile.am | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'xlators/features/glupy/src/Makefile.am') diff --git a/xlators/features/glupy/src/Makefile.am b/xlators/features/glupy/src/Makefile.am index 0354b1e9dba..2ac0d99cd5f 100644 --- a/xlators/features/glupy/src/Makefile.am +++ b/xlators/features/glupy/src/Makefile.am @@ -14,8 +14,11 @@ glupy_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \ noinst_HEADERS = glupy.h -# Install glupy.py into the Python site-packages area -pyglupydir = @BUILD_PYTHON_SITE_PACKAGES@/gluster/glupy -pyglupy_PYTHON = glupy.py __init__.py +# Install __init__.py into the Python site-packages area +pyglupydir = @BUILD_PYTHON_SITE_PACKAGES@/gluster +pyglupy_PYTHON = __init__.py + +# Install glupy/__init_-.py into the Python site-packages area +SUBDIRS = glupy CLEANFILES = -- cgit