X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=userv-utils.git;a=blobdiff_plain;f=ipif%2FMakefile;h=a34a85ff0d41407b0238b3dc23f3de715ac52415;hp=ab3db07347fcc7a56441408b84ea5de6a4a5f30e;hb=0ae8e6867facf7eb8055533a642026d7c9e9cf38;hpb=c62ccbd5747bc841fd181e53b896647b73108c9e

diff --git a/ipif/Makefile b/ipif/Makefile
index ab3db07..a34a85f 100644
--- a/ipif/Makefile
+++ b/ipif/Makefile
@@ -1,6 +1,7 @@
 # Makefile for ipif/udptunnel stuff
 
-# Copyright (C) 1999-2000 Ian Jackson
+# Copyright (C) 1999-2000,2003 Ian Jackson
+# This file is part of ipif, part of userv-utils
 #
 # This is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -18,27 +19,10 @@
 #
 # $Id$
 
-OPTIMISE=	-O2
-CFLAGS=		-Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith \
-		-Wwrite-strings -g $(OPTIMISE) -D_GNU_SOURCE \
-		$(XCFLAGS)
-
-etcdir=		/etc
-prefix=		/usr/local
-bindir=		$(prefix)/bin
-vardir=		/var
-
-libdir=		$(prefix)/lib
-sharedir=	$(prefix)/share
-libuserv=	$(libdir)/userv
-shareuserv=	$(sharedir)/userv
-varlib=		$(vardir)/lib
-varlibuserv=	$(varlib)/userv
-varlibvpn=	$(varlibuserv)/vpn
+include ../settings.make
 
-etcuserv=	$(etcdir)/userv
+varlibvpn=	$(varlibuserv)/vpn
 etcvpn=		$(etcdir)/userv/vpn
-services=	$(etcuserv)/services.d
 
 PROGRAM_TARGETS=	udptunnel-forwarder udptunnel-reconf
 TARGETS=		service blowfishtest $(PROGRAM_TARGETS)
@@ -53,24 +37,28 @@ OBJS_BFTEST=	blowfishtest.o blowfish.o hex.o
 all:		$(TARGETS)
 
 install:	all
-		mkdir -p $(libuserv) $(services) $(etcvpn) \
+		mkdir -p $(bindir) $(libuserv) $(services) \
 			$(varlibvpn) $(shareuserv)
 		cp -b service $(libuserv)/ipif
 		cp -b $(PROGRAMS) $(bindir)/.
 		cp ipif $(services)/ipif:new
 		set -e; cd $(services); test -f ipif || mv ipif:new ipif
-		cp *.example $(etcvpn)/.
 		cp udptunnel-vpn-config.m4 udptunnel-vpn-defaults \
 			$(shareuserv)/.
 
+install-docs:
+
+install-examples:
+		mkdir -p $(etcvpn)
+		cp *.example $(etcvpn)/.
+
 udptunnel-reconf:	udptunnel-reconf.pl Makefile
-		perl -pe '	\
-	print "\
-\$$shareuserv= \"$(shareuserv)\";\n\
-\$$etcvpn= \"$(etcvpn)\";\n\
-\$$varlibvpn= \"$(varlibvpn)\";\n" if m#^\# \@\@\@\-#;	\
-	$$_="" if m/^\# \@\@\@\-/ .. m/^\# \-\@\@\@/;	\
-		'	\
+		perl -p 						  \
+	-e '	print "							' \
+	-e '\$$shareuserv= \"$(shareuserv)\";\n				' \
+	-e '\$$etcvpn= \"$(etcvpn)\";\n					' \
+	-e '\$$varlibvpn= \"$(varlibvpn)\";\n" if m#^\# \@\@\@\-#;	' \
+	-e '	$$_="" if m/^\# \@\@\@\-/ .. m/^\# \-\@\@\@/;		' \
 			<$< >$@.new
 		chmod +x $@.new
 		mv -f $@.new $@