*** empty log message ***

[userv-utils.git] / ipif / Makefile

diff --git a/ipif/Makefile b/ipif/Makefile
index ab3db07347fcc7a56441408b84ea5de6a4a5f30e..879c0136ab96f624ef528aae57c1c13a4724d13b 100644 (file)
--- 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 "\