From af7201526cf9637ca59c48f3844da165c51d71c0 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 27 Dec 2014 21:35:02 +0000 Subject: [PATCH] Build system: Makefile: support DESTDIR. Signed-off-by: Ian Jackson --- Makefile.in | 6 +++--- debian/changelog | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile.in b/Makefile.in index b7e933b..16b099a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -32,10 +32,10 @@ INSTALL:=@INSTALL@ INSTALL_PROGRAM:=@INSTALL_PROGRAM@ INSTALL_SCRIPT:=@INSTALL_SCRIPT@ -prefix:=@prefix@ +prefix:=$(DESTDIR)@prefix@ exec_prefix:=@exec_prefix@ sbindir:=@sbindir@ -sysconfdir:=@sysconfdir@ +sysconfdir:=$(DESTDIR)@sysconfdir@ 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, \ - $p/share/secnet/$l.$e \ + $(DESTDIR)$p/share/secnet/$l.$e \ ))) %.c: %.y diff --git a/debian/changelog b/debian/changelog index dcb55af..768c9f7 100644 --- 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. + * Makefile: support DESTDIR. - -- Ian Jackson Sat, 27 Dec 2014 21:28:25 +0000 + -- secnet (0.4.0~beta1) unstable; urgency=low -- 2.30.2