From c0e44c5359caead014b9db839ec76c2be5662054 Mon Sep 17 00:00:00 2001 From: Peter Michael Green Date: Thu, 10 Jan 2019 14:05:34 +0000 Subject: [PATCH] Use Debian file layout for python stuff. --- Makefile | 2 +- debian/patches/{01-prefix.patch => 09-filelayout.patch} | 9 +++++++++ debian/patches/series | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) rename debian/patches/{01-prefix.patch => 09-filelayout.patch} (53%) diff --git a/Makefile b/Makefile index d05cca7..318c224 100644 --- a/Makefile +++ b/Makefile @@ -83,7 +83,7 @@ clean: ifeq ($(DESTDIR),) PYINSTALLARGS = else - PYINSTALLARGS = --root=$(DESTDIR) + PYINSTALLARGS = --install-layout=deb --root=$(DESTDIR) endif install: $(ALL) diff --git a/debian/patches/01-prefix.patch b/debian/patches/09-filelayout.patch similarity index 53% rename from debian/patches/01-prefix.patch rename to debian/patches/09-filelayout.patch index 3905e6e..1256496 100644 --- a/debian/patches/01-prefix.patch +++ b/debian/patches/09-filelayout.patch @@ -9,3 +9,12 @@ exec_prefix = $(prefix) bindir = $(exec_prefix)/bin includedir = $(prefix)/include +@@ -83,7 +83,7 @@ clean: + ifeq ($(DESTDIR),) + PYINSTALLARGS = + else +- PYINSTALLARGS = --root=$(DESTDIR) ++ PYINSTALLARGS = --install-layout=deb --root=$(DESTDIR) + endif + + install: $(ALL) diff --git a/debian/patches/series b/debian/patches/series index c83b3aa..8ee8028 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -01-prefix.patch 02-add-soversion.patch 03-fix-destdir.patch 04-make-uninstall.patch @@ -6,3 +5,4 @@ 06-64-bit-clean.patch 07-arm64-pi-detection.patch 08-dont-install-libs-as-manpages.patch +09-filelayout.patch -- 2.30.2