X-Git-Url: https://git.distorted.org.uk/~mdw/userv-utils/blobdiff_plain/80ebbf9e58e2c8a5980d96fd33ac68fd790ed53d..5e8cb121d0061bf38eb33be82b0b026ddafeda63:/ipif/Makefile

diff --git a/ipif/Makefile b/ipif/Makefile
index a34a85f..78b4972 100644
--- a/ipif/Makefile
+++ b/ipif/Makefile
@@ -1,11 +1,16 @@
 # Makefile for ipif/udptunnel stuff
 
-# Copyright (C) 1999-2000,2003 Ian Jackson
-# This file is part of ipif, part of userv-utils
+# This file is part of ipif, part of userv-util
+#
+# Copyright 1996-2013 Ian Jackson <ijackson@chiark.greenend.org.uk>
+# Copyright 1998 David Damerell <damerell@chiark.greenend.org.uk>
+# Copyright 1999,2003
+#    Chancellor Masters and Scholars of the University of Cambridge
+# Copyright 2010 Tony Finch <fanf@dotat.at>
 #
 # This is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -14,19 +19,28 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with userv-utils; if not, write to the Free Software
-# Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# $Id$
+# along with userv-utils; if not, see http://www.gnu.org/licenses/.
 
 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
+
+TARGETS+=		service
+TARGETS$(depr)+=	blowfishtest
+TARGETS+=		$(PROGRAM_TARGETS)
+
+PROGRAMS$(depr)+=	udptunnel
+PROGRAMS+=		$(PROGRAM_TARGETS)
+
+DIRS+=			$(libuserv) $(etcuserv) $(services)
+DIRS$(depr)+=		$(bindir) $(varlibvpn) $(shareuserv)
 
-PROGRAM_TARGETS=	udptunnel-forwarder udptunnel-reconf
-TARGETS=		service blowfishtest $(PROGRAM_TARGETS)
-PROGRAMS=		udptunnel $(PROGRAM_TARGETS)
+SHAREFILES$(depr)+=	udptunnel-vpn-config.m4 udptunnel-vpn-defaults
 
 MECHFILES=	null pkcs5 timestamp sequence blowfish
 MECHOBJS=	$(foreach m, $(MECHFILES), mech-$m.o)
@@ -37,20 +51,20 @@ OBJS_BFTEST=	blowfishtest.o blowfish.o hex.o
 all:		$(TARGETS)
 
 install:	all
-		mkdir -p $(bindir) $(libuserv) $(services) \
-			$(varlibvpn) $(shareuserv)
+		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 						  \