polypath: Reorganise to break up ifaddr handling

[secnet.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 97acf48d5c1e83ce6fbb42c6b261602c4fa658a9..f68022abbc8e4bd5c3a5bdc8115c6b75e3fc688e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -30,6 +30,15 @@ RM:=@RM@
 CC:=@CC@
 INSTALL:=@INSTALL@
 INSTALL_PROGRAM:=@INSTALL_PROGRAM@
+INSTALL_SCRIPT:=@INSTALL_SCRIPT@
+
+prefix:=@prefix@
+exec_prefix:=@exec_prefix@
+sbindir:=@sbindir@
+sysconfdir:=@sysconfdir@
+datarootdir:=@datarootdir@
+transform:=@program_transform_name@
+mandir:=@mandir@
 
 CFLAGS:=-Wall @WRITESTRINGS@ @CFLAGS@ -Werror \
        -W -Wno-unused -Wno-unused-parameter \
@@ -40,22 +49,15 @@ CFLAGS:=-Wall @WRITESTRINGS@ @CFLAGS@ -Werror \
        -Wno-strict-aliasing -fno-strict-aliasing \
        -MMD
 ALL_CFLAGS:=@DEFS@ -I$(srcdir) -I. $(CFLAGS) $(EXTRA_CFLAGS)
-CPPFLAGS:=@CPPFLAGS@ $(EXTRA_CPPFLAGS)
+CPPFLAGS:=@CPPFLAGS@ -DDATAROOTDIR='"$(datarootdir)"' $(EXTRA_CPPFLAGS)
 LDFLAGS:=@LDFLAGS@ $(EXTRA_LDFLAGS)
 LDLIBS:=@LIBS@ $(EXTRA_LDLIBS)
 
-prefix:=@prefix@
-exec_prefix:=@exec_prefix@
-sbindir:=@sbindir@
-sysconfdir:=@sysconfdir@
-transform:=@program_transform_name@
-mandir:=@mandir@
-
 TARGETS:=secnet
 
 OBJECTS:=secnet.o util.o conffile.yy.o conffile.tab.o conffile.o modules.o \
        resolver.o random.o udp.o site.o transform-cbcmac.o transform-eax.o \
-       comm-common.o \
+       comm-common.o polypath.o \
        netlink.o rsa.o dh.o serpent.o serpentbe.o \
        md5.o sha512.o tun.o slip.o sha1.o ipaddr.o log.o \
        process.o @LIBOBJS@ \
@@ -166,6 +168,7 @@ check-ipaddrset: ipaddrset-test.py ipaddrset.py ipaddrset-test.expected
 installdirs:
        $(INSTALL) -d $(prefix)/share/secnet $(sbindir)
        $(INSTALL) -d $(mandir)/man8
+       $(INSTALL) -d $(datarootdir)/secnet
 
 install: installdirs
        set -e; ok=true; for f in $(STALE_PYTHON_FILES); do \
@@ -179,6 +182,8 @@ install: installdirs
        $(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_SCRIPT) ${srcdir}/polypath-interface-monitor-linux \
+               $(datarootdir)/secnet/.
        $(INSTALL) secnet.8 $(mandir)/man8/secnet.8
 
 install-force: