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

diff --git a/ipif/Makefile b/ipif/Makefile
index 5136656..0addd4d 100644
--- a/ipif/Makefile
+++ b/ipif/Makefile
@@ -26,9 +26,20 @@ include ../settings.make
 varlibvpn=	$(varlibuserv)/vpn
 etcvpn=		$(etcdir)/userv/vpn
 
-PROGRAM_TARGETS=	udptunnel-forwarder udptunnel-reconf
-TARGETS=		service blowfishtest $(PROGRAM_TARGETS)
-PROGRAMS=		udptunnel $(PROGRAM_TARGETS)
+PROGRAM_TARGETS+=
+PROGRAM_TARGETS$(depr)+= udptunnel-forwarder udptunnel-reconf
+
+TARGETS+=		service
+TARGETS$(depr)+=	blowfishtest
+TARGETS+=		$(PROGRAM_TARGETS)
+
+PROGRAMS$(depr)+=	udptunnel
+PROGRAMS+=		$(PROGRAM_TARGETS)
+
+DIRS+=			$(libuserv)
+DIRS$(depr)+=		$(bindir) $(services) $(varlibvpn) $(shareuserv)
+
+SHAREFILES$(depr)+=	udptunnel-vpn-config.m4 udptunnel-vpn-defaults
 
 MECHFILES=	null pkcs5 timestamp sequence blowfish
 MECHOBJS=	$(foreach m, $(MECHFILES), mech-$m.o)
@@ -38,21 +49,21 @@ OBJS_BFTEST=	blowfishtest.o blowfish.o hex.o
 
 all:		$(TARGETS)
 
-install:	all
-		mkdir -p $(bindir) $(libuserv) $(services) \
-			$(varlibvpn) $(shareuserv)
+install:	installdirs all
+		mkdir -p $(DIRS)
 		cp -b service $(libuserv)/ipif
-		cp -b $(PROGRAMS) $(bindir)/.
+		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
-		cp udptunnel-vpn-config.m4 udptunnel-vpn-defaults \
-			$(shareuserv)/.
+		set -e; for f in $(SHAREFILES); do cp $$f $(shareuserv)/.; done
 
 install-docs:
 
 install-examples:
-		mkdir -p $(etcvpn)
-		cp *.example $(etcvpn)/.
+		set -e; if [ "x$depr" = x ]; then \
+			mkdir -p $(etcvpn); \
+			cp *.example $(etcvpn)/.; \
+		fi
 
 udptunnel-reconf:	udptunnel-reconf.pl Makefile
 		perl -p 						  \