From 9c7a0b4e57f18adee8545804e34667334c426635 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 28 Dec 2014 12:38:05 +0000 Subject: [PATCH] Build system: Install ipaddrset.py and secnet.8 with correct perms Do not install them as executables; use INSTALL_DATA instead. Signed-off-by: Ian Jackson --- Makefile.in | 5 +++-- debian/changelog | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index 16b099a..8ccb29a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -31,6 +31,7 @@ CC:=@CC@ INSTALL:=@INSTALL@ INSTALL_PROGRAM:=@INSTALL_PROGRAM@ INSTALL_SCRIPT:=@INSTALL_SCRIPT@ +INSTALL_DATA:=@INSTALL_DATA@ prefix:=$(DESTDIR)@prefix@ exec_prefix:=@exec_prefix@ @@ -181,10 +182,10 @@ install: installdirs $$ok $(INSTALL_PROGRAM) secnet $(sbindir)/`echo secnet|sed '$(transform)'` $(INSTALL_PROGRAM) ${srcdir}/make-secnet-sites $(sbindir)/`echo make-secnet-sites|sed '$(transform)'` - $(INSTALL) ${srcdir}/ipaddrset.py $(prefix)/share/secnet/ipaddrset.py + $(INSTALL_DATA) ${srcdir}/ipaddrset.py $(prefix)/share/secnet/ipaddrset.py $(INSTALL_SCRIPT) ${srcdir}/polypath-interface-monitor-linux \ $(datarootdir)/secnet/. - $(INSTALL) secnet.8 $(mandir)/man8/secnet.8 + $(INSTALL_DATA) secnet.8 $(mandir)/man8/secnet.8 install-force: rm -f $(STALE_PYTHON_FILES) diff --git a/debian/changelog b/debian/changelog index ea8280e..51859bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ secnet (0.4.0~beta2~) unstable; urgency=low * Portability fix: Build where size_t is not compatible with int. * Makefile: support DESTDIR. * debian/rules: set DESTDIR (not prefix). + * Do not install ipaddrset.py and secnet.8 executable. -- -- 2.11.0