From: Aleksandr Mezin <mezin.alexander@gmail.com>
Date: Tue, 31 May 2016 11:33:59 +0000 (+0600)
Subject: python-lxc: always set --root for install command
X-Git-Tag: lxc-2.1.0~414^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=371cffc37af4e7af67bad4430d8535c09410a748;p=thirdparty%2Flxc.git

python-lxc: always set --root for install command

This implies '--single-version-externally-managed', which we
actually want for autotools builds.

Fixes current problems with jenkins test suite.

Signed-off-by: Aleksandr Mezin <mezin.alexander@gmail.com>
---

diff --git a/src/python-lxc/Makefile.am b/src/python-lxc/Makefile.am
index 4a2b86e7b..2d7ae076a 100644
--- a/src/python-lxc/Makefile.am
+++ b/src/python-lxc/Makefile.am
@@ -6,18 +6,15 @@ else
     DISTSETUPOPTS=
 endif
 
-INSTALL_OPTS := install --prefix=$(prefix) --no-compile $(DISTSETUPOPTS)
 CALL_SETUP_PY := cd @srcdir@ && $(PYTHON) setup.py build -b @abs_builddir@/build
 
 all:
 	$(CALL_SETUP_PY) build_ext -I @abs_top_srcdir@/src -L @abs_top_builddir@/src/lxc --no-pkg-config
 
+DESTDIR = / # default
+
 install:
-	if [ -z "$(DESTDIR)" ]; then \
-		$(CALL_SETUP_PY) $(INSTALL_OPTS); \
-	else \
-		$(CALL_SETUP_PY) $(INSTALL_OPTS) --root=$(DESTDIR); \
-	fi
+	$(CALL_SETUP_PY) install --prefix=$(prefix) --no-compile $(DISTSETUPOPTS) --root=$(DESTDIR)
 
 clean-local:
 	rm -rf @builddir@/build