]> git.proxmox.com Git - mirror_lxc.git/commitdiff
python-lxc: always set --root for install command
authorAleksandr Mezin <mezin.alexander@gmail.com>
Tue, 31 May 2016 11:33:59 +0000 (17:33 +0600)
committerAleksandr Mezin <mezin.alexander@gmail.com>
Tue, 31 May 2016 11:36:17 +0000 (17:36 +0600)
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>
src/python-lxc/Makefile.am

index 4a2b86e7b93cfa5dc593dd3c276f55489c8a3a67..2d7ae076aa1c1df0c21570960560f0a5577bd516 100644 (file)
@@ -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