Use Debian file layout for python stuff.

diff --git a/Makefile b/Makefile
index d05cca729aed107d8450399e8188d3aa8384bf7b..318c224f93cd88734a5569f3b4319d4c3a6d09aa 100644 (file)
--- 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/01-prefix.patch
deleted file mode 100644 (file)
index 3905e6e..0000000
--- a/debian/patches/01-prefix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -31,7 +31,7 @@
- 
- LL3      = -L. -lpigpiod_if2 -pthread -lrt
- 
--prefix = /usr/local
-+prefix = /usr
- exec_prefix = $(prefix)
- bindir = $(exec_prefix)/bin
- includedir = $(prefix)/include

diff --git a/debian/patches/09-filelayout.patch b/debian/patches/09-filelayout.patch
new file mode 100644 (file)
index 0000000..1256496
--- /dev/null
+++ b/debian/patches/09-filelayout.patch
@@ -0,0 +1,20 @@
+--- a/Makefile
++++ b/Makefile
+@@ -31,7 +31,7 @@
+ 
+ LL3      = -L. -lpigpiod_if2 -pthread -lrt
+ 
+-prefix = /usr/local
++prefix = /usr
+ 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 c83b3aa6fb2cc1a15d945a3a1c13ad0a43b85584..8ee80281449001eafe922cec3e7df9ff8aef3cdf 100644 (file)
--- 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