X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=ipif%2FMakefile;h=289935e7eef05fcae75d3e0ebee8fbc745af5896;hb=26f67181f7dfdb4eec067ad0488ef65961b0b961;hp=0addd4df8621b432df405cb8d33a61ef2b29bd54;hpb=97f318e04ed0024b2bf5903215a75249401d3fd7;p=userv-utils.git

diff --git a/ipif/Makefile b/ipif/Makefile
index 0addd4d..289935e 100644
--- a/ipif/Makefile
+++ b/ipif/Makefile
@@ -24,7 +24,8 @@
 include ../settings.make
 
 varlibvpn=	$(varlibuserv)/vpn
-etcvpn=		$(etcdir)/userv/vpn
+etcuserv=	$(etcdir)/userv
+etcvpn=		$(etcuserv)/vpn
 
 PROGRAM_TARGETS+=
 PROGRAM_TARGETS$(depr)+= udptunnel-forwarder udptunnel-reconf
@@ -36,8 +37,10 @@ TARGETS+=		$(PROGRAM_TARGETS)
 PROGRAMS$(depr)+=	udptunnel
 PROGRAMS+=		$(PROGRAM_TARGETS)
 
-DIRS+=			$(libuserv)
-DIRS$(depr)+=		$(bindir) $(services) $(varlibvpn) $(shareuserv)
+DIRS+=			$(libuserv) $(etcuserv) $(services)
+DIRS+=			$(docdir)/userv-ipif
+DIRS+=			$(etcuserv)/ipif-access
+DIRS$(depr)+=		$(bindir) $(varlibvpn) $(shareuserv)
 
 SHAREFILES$(depr)+=	udptunnel-vpn-config.m4 udptunnel-vpn-defaults
 
@@ -49,15 +52,17 @@ OBJS_BFTEST=	blowfishtest.o blowfish.o hex.o
 
 all:		$(TARGETS)
 
-install:	installdirs all
+install:	all
 		mkdir -p $(DIRS)
 		cp -b service $(libuserv)/ipif
+		cp -b service-wrap $(libuserv)/ipif-access
 		set -e; for f in $(PROGRAMS); do cp -b $$f $(bindir)/.; done
 		cp ipif $(services)/ipif:new
 		set -e; cd $(services); test -f ipif || mv ipif:new ipif
 		set -e; for f in $(SHAREFILES); do cp $$f $(shareuserv)/.; done
 
 install-docs:
+		sed -n '1,/^$$/p' service.c >$(docdir)/userv-ipif/service.c.txt
 
 install-examples:
 		set -e; if [ "x$depr" = x ]; then \