X-Git-Url: https://git.distorted.org.uk/~mdw/userv-utils/blobdiff_plain/97f318e04ed0024b2bf5903215a75249401d3fd7..4f937f540734e6f5977b9c279f8f24035a259310:/ipif/Makefile

diff --git a/ipif/Makefile b/ipif/Makefile
index 0addd4d..fe6ec6e 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,9 @@ 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$(depr)+=		$(bindir) $(varlibvpn) $(shareuserv)
 
 SHAREFILES$(depr)+=	udptunnel-vpn-config.m4 udptunnel-vpn-defaults
 
@@ -49,7 +51,7 @@ OBJS_BFTEST=	blowfishtest.o blowfish.o hex.o
 
 all:		$(TARGETS)
 
-install:	installdirs all
+install:	all
 		mkdir -p $(DIRS)
 		cp -b service $(libuserv)/ipif
 		set -e; for f in $(PROGRAMS); do cp -b $$f $(bindir)/.; done
@@ -58,6 +60,7 @@ install:	installdirs all
 		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 \