Build system: Makefile: support DESTDIR.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/Makefile.in b/Makefile.in
index b7e933bfb4733627789e534ea5a7c35f1794f87c..16b099af2e1109142c5d41faee4d40c662cb47af 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -32,10 +32,10 @@ INSTALL:=@INSTALL@
 INSTALL_PROGRAM:=@INSTALL_PROGRAM@
 INSTALL_SCRIPT:=@INSTALL_SCRIPT@
 
 INSTALL_PROGRAM:=@INSTALL_PROGRAM@
 INSTALL_SCRIPT:=@INSTALL_SCRIPT@
 

-prefix:=@prefix@
+prefix:=$(DESTDIR)@prefix@

 exec_prefix:=@exec_prefix@
 sbindir:=@sbindir@
 exec_prefix:=@exec_prefix@
 sbindir:=@sbindir@

-sysconfdir:=@sysconfdir@
+sysconfdir:=$(DESTDIR)@sysconfdir@

 datarootdir:=@datarootdir@
 transform:=@program_transform_name@
 mandir:=@mandir@
 datarootdir:=@datarootdir@
 transform:=@program_transform_name@
 mandir:=@mandir@


@@ -75,7 +75,7 @@ endif
 STALE_PYTHON_FILES=    $(foreach e, py pyc, \
                        $(foreach p, /usr /usr/local, \
                        $(foreach l, ipaddr, \
 STALE_PYTHON_FILES=    $(foreach e, py pyc, \
                        $(foreach p, /usr /usr/local, \
                        $(foreach l, ipaddr, \

-                       $p/share/secnet/$l.$e \
+                       $(DESTDIR)$p/share/secnet/$l.$e \

                        )))
 
 %.c:   %.y
                        )))
 
 %.c:   %.y

diff --git a/debian/changelog b/debian/changelog
index dcb55af2a6d8da40ec9a36f4f5d72e680c33919c..768c9f718fa2a70a85ee4edb8a19f7f907b5b1c5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ secnet (0.4.0~beta2~) unstable; urgency=low
   * polypath: Skip "tentative" IPv6 local addresses.
   * polypath: Improve logging and debug output.
   * Portability fix: Build where size_t is not compatible with int.
   * polypath: Skip "tentative" IPv6 local addresses.
   * polypath: Improve logging and debug output.
   * Portability fix: Build where size_t is not compatible with int.

+  * Makefile: support DESTDIR.

 
 

- -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sat, 27 Dec 2014 21:28:25 +0000
+ --

 
 secnet (0.4.0~beta1) unstable; urgency=low
 
 
 secnet (0.4.0~beta1) unstable; urgency=low