summaryrefslogtreecommitdiffstats
path: root/xlators
diff options
context:
space:
mode:
authorMichael Scherer <misc@redhat.com>2015-07-31 16:37:41 +0200
committerKaleb KEITHLEY <kkeithle@redhat.com>2015-08-03 02:58:30 -0700
commit871000e3ddb457c9cc5757cd94cfc178e3c1be29 (patch)
treef27b9d4ffd964864a6009a7ba0fcf8f71ccc19ae /xlators
parent4d2ec1d0d6bebcfb19e0c4ecf741ddd29bb28e58 (diff)
Add DESTDIR support for pyglupy Makefile
Smoke tests run on a new slave on Fedora 22 fail because make install try to install the python package in /usr/lib/python2.7 without being root, because there is no $DESTDIR support for that part. Change-Id: Ibed17dd091a96fbdf5536ac66b8c876b33a39cd6 Signed-off-by: Michael Scherer <mscherer@redhat.com> Reviewed-on: http://review.gluster.org/11813 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Diffstat (limited to 'xlators')
-rw-r--r--xlators/features/glupy/src/Makefile.am2
-rw-r--r--xlators/features/glupy/src/glupy/Makefile.am2
2 files changed, 2 insertions, 2 deletions
diff --git a/xlators/features/glupy/src/Makefile.am b/xlators/features/glupy/src/Makefile.am
index 2ac0d99cd5f..7127fd187a3 100644
--- a/xlators/features/glupy/src/Makefile.am
+++ b/xlators/features/glupy/src/Makefile.am
@@ -15,7 +15,7 @@ glupy_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \
noinst_HEADERS = glupy.h
# Install __init__.py into the Python site-packages area
-pyglupydir = @BUILD_PYTHON_SITE_PACKAGES@/gluster
+pyglupydir = $(DESTDIR)/@BUILD_PYTHON_SITE_PACKAGES@/gluster
pyglupy_PYTHON = __init__.py
# Install glupy/__init_-.py into the Python site-packages area
diff --git a/xlators/features/glupy/src/glupy/Makefile.am b/xlators/features/glupy/src/glupy/Makefile.am
index 573d2da12e1..ecaf5460efc 100644
--- a/xlators/features/glupy/src/glupy/Makefile.am
+++ b/xlators/features/glupy/src/glupy/Makefile.am
@@ -1,5 +1,5 @@
# Install __init__.py into the Python site-packages area
-pyglupydir = @BUILD_PYTHON_SITE_PACKAGES@/gluster/glupy
+pyglupydir = $(DESTDIR)/@BUILD_PYTHON_SITE_PACKAGES@/gluster/glupy
pyglupy_PYTHON = __init__.py
CLEANFILES =