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 <ijackson@chiark.greenend.org.uk>

diff --git a/Makefile.in b/Makefile.in
index 16b099af2e1109142c5d41faee4d40c662cb47af..8ccb29aca1368212ae95777aacd80bb6a675f01e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -31,6 +31,7 @@ CC:=@CC@
 INSTALL:=@INSTALL@
 INSTALL_PROGRAM:=@INSTALL_PROGRAM@
 INSTALL_SCRIPT:=@INSTALL_SCRIPT@
 INSTALL:=@INSTALL@
 INSTALL_PROGRAM:=@INSTALL_PROGRAM@
 INSTALL_SCRIPT:=@INSTALL_SCRIPT@

+INSTALL_DATA:=@INSTALL_DATA@

 
 prefix:=$(DESTDIR)@prefix@
 exec_prefix:=@exec_prefix@
 
 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)'`
        $$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_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)
 
 install-force:
        rm -f $(STALE_PYTHON_FILES)

diff --git a/debian/changelog b/debian/changelog
index ea8280e254500fb9f41163b696023f7b716d2df2..51859bcc109291be3aefd59aea876bc0ae14d551 100644 (file)
--- 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).
   * 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.

 
  --
 
 
  --