generic build fix: makefile multi-line incompatibility fix

[userv-utils.git] / ipif / Makefile

diff --git a/ipif/Makefile b/ipif/Makefile
index e3dac053712024bae9bba810cfbd50a7289b1ee7..a34a85ff0d41407b0238b3dc23f3de715ac52415 100644 (file)
--- 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,22 +19,12 @@
 #
 # $Id$
 
-OPTIMISE=      -O2
-CFLAGS=                -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith \
-               -Wwrite-strings -g $(OPTIMISE) -D_GNU_SOURCE \
-               $(XCFLAGS)
+include ../settings.make
 
-etcdir=                /etc
-prefix=                /usr/local
-bindir=                $(prefix)/bin
+varlibvpn=     $(varlibuserv)/vpn
+etcvpn=                $(etcdir)/userv/vpn
 
-libdir=                $(prefix)/lib
-libuserv=      $(libdir)/userv
-
-etcuserv=      $(etcdir)/userv
-services=      $(etcuserv)/services.d
-
-PROGRAM_TARGETS=       udptunnel-forwarder
+PROGRAM_TARGETS=       udptunnel-forwarder udptunnel-reconf
 TARGETS=               service blowfishtest $(PROGRAM_TARGETS)
 PROGRAMS=              udptunnel $(PROGRAM_TARGETS)
 
@@ -46,11 +37,32 @@ OBJS_BFTEST=        blowfishtest.o blowfish.o hex.o
 all:           $(TARGETS)
 
 install:       all
-               mkdir -p $(libuserv) $(services)
+               mkdir -p $(bindir) $(libuserv) $(services) \
+                       $(varlibvpn) $(shareuserv)
                cp -b service $(libuserv)/ipif
-               cp ipif $(services)/ipif:new
                cp -b $(PROGRAMS) $(bindir)/.
+               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)/.
+
+install-docs:
+
+install-examples:
+               mkdir -p $(etcvpn)
+               cp *.example $(etcvpn)/.
+
+udptunnel-reconf:      udptunnel-reconf.pl Makefile
+               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 $@
+
 
 udptunnel-forwarder:   $(OBJS_FORWARD)
                $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS_FORWARD)
@@ -66,7 +78,7 @@ automech.c:           automech.h
 clean:
                rm -f *.o core automech.[ch] *~ ./#*#
 
-realclean:             clean
+realclean distclean:   clean
                rm -f $(TARGETS)
 
 forwarder.o $(MECHOBJS) automech.o utils.o:    forwarder.h automech.h