From 13b9ea7f1cb416816a926e62e8f2fce9debf49aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Tue, 24 Jan 2017 01:38:35 +0100 Subject: [PATCH] debian: fix install location of python files Debian use /usr/lib/python*/dist-packages (instead of site-packages) for packaged python modules. It's achieved using --install-layout=deb option, so pass it on Debian build. --- debian/rules | 2 +- imgconverter/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index 2cec30c..0df7eb6 100755 --- a/debian/rules +++ b/debian/rules @@ -13,5 +13,5 @@ override_dh_auto_build: make all LIBDIR=/usr/lib DEBIANBUILD=1 override_dh_auto_install: - make install LIBDIR=/usr/lib DEBIANBUILD=1 + make install LIBDIR=/usr/lib DEBIANBUILD=1 PYTHON_PREFIX_ARG=--install-layout=deb make install-debian-kernel-support LIBDIR=/usr/lib DEBIANBUILD=1 diff --git a/imgconverter/Makefile b/imgconverter/Makefile index 72014c2..9dfab43 100644 --- a/imgconverter/Makefile +++ b/imgconverter/Makefile @@ -7,7 +7,7 @@ clean: .PHONY: clean install: - python setup.py install -O1 --skip-build --prefix=/usr --root $(DESTDIR) + python setup.py install -O1 --skip-build $(PYTHON_PREFIX_ARG) --root $(DESTDIR) #ifeq (1,${DEBIANBUILD}) # cp *.py $(DESTDIR)/$(PYTHON_SITEARCH)/qubes/ #else