Apply still-relavent part of 01-destdir.diff and remove part that is now upstream.

diff --git a/Makefile b/Makefile
index 0aa14fe400303e6efbc371be38f6fa93cb5ec9e8..d05cca729aed107d8450399e8188d3aa8384bf7b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ LL2      = -L. -lpigpiod_if -pthread -lrt
 
 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/01-destdir.diff b/debian/patches/01-destdir.diff
index c5a2276c4fa5c9d012a3752ba35a0e43d0ed9950..3905e6edbd1a903366d1fdada1e1c2278165800d 100644 (file)
--- a/debian/patches/01-destdir.diff
+++ b/debian/patches/01-destdir.diff
@@ -9,20 +9,3 @@
  exec_prefix = $(prefix)
  bindir = $(exec_prefix)/bin
  includedir = $(prefix)/include
-@@ -90,13 +90,13 @@
-       install -m 0755 pig2vcd           $(DESTDIR)$(bindir)
-       install -m 0755 pigpiod           $(DESTDIR)$(bindir)
-       install -m 0755 pigs              $(DESTDIR)$(bindir)
--      if which python2; then python2 setup.py install; fi
--      if which python3; then python3 setup.py install; fi
-+      if which python2; then python2 setup.py install --install-layout=deb --root=$(DESTDIR); fi
-+      if which python3; then python3 setup.py install --install-layout=deb --root=$(DESTDIR); fi
-       install -m 0755 -d                $(DESTDIR)$(mandir)/man1
-       install -m 0644 *.1               $(DESTDIR)$(mandir)/man1
-       install -m 0755 -d                $(DESTDIR)$(mandir)/man3
-       install -m 0644 *.3               $(DESTDIR)$(mandir)/man3
--      ldconfig
-+      #ldconfig
- 
- uninstall:
-       rm -f $(DESTDIR)$(includedir)/pigpio.h