*** empty log message ***

2 files changed, 10 insertions, 22 deletions

diff --git a/ipif/Makefile b/ipif/Makefile
index ab3db07..879c013 100644
--- a/ipif/Makefile
+++ b/ipif/Makefile
@@ -18,27 +18,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,16 +36,21 @@ 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 "\
diff --git a/ipif/ipif b/ipif/ipif
index 6d283bc..f8c5838 100644
--- a/ipif/ipif
+++ b/ipif/ipif
@@ -5,5 +5,5 @@ if ( grep calling-user-shell /etc/shells
 	no-set-environment
 	no-suppress-args
 	no-disconnect-hup
-	execute /usr/local/lib/userv/ipif /etc/userv/ipif-networks --
+	execute /usr/lib/userv/ipif /etc/userv/ipif-networks --
 fi