Build system: Fix check for <linux/if_tun.h> and remove our copy

[secnet.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 5970b87fec3d7c96587b1a8d7a1c240da81c30b1..8ccb29aca1368212ae95777aacd80bb6a675f01e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -18,7 +18,7 @@
 .PHONY:        all clean realclean distclean dist install
 
 PACKAGE:=secnet
-VERSION:=0.4.0~~iwj~
+VERSION:=0.4.0~beta1
 
 @SET_MAKE@
 
@@ -31,11 +31,12 @@ CC:=@CC@
 INSTALL:=@INSTALL@
 INSTALL_PROGRAM:=@INSTALL_PROGRAM@
 INSTALL_SCRIPT:=@INSTALL_SCRIPT@
+INSTALL_DATA:=@INSTALL_DATA@
 
-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 +76,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
@@ -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)