ipif: Fix deprecation of udptunnel so it builds

diff --git a/debian/rules b/debian/rules
index dbe4360abbd7463500042331a984bf25333ef221..49c2f017f53e0fa66dda0b2ee023eed4b7d0d535 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -56,8 +56,8 @@ binary-prep:
                        prefix=$t/userv-$$s/usr \
                        etcdir=$t/userv-$$s/etc \
                        vardir=$t/userv-$$s/var \
+                       depr=disable \
                        gituser=root; \
-                       depr=disable; \
        done
        #
        mv debian/tmp/userv-www-cgi debian/tmp/userv-cgi

diff --git a/ipif/Makefile b/ipif/Makefile
index 0addd4df8621b432df405cb8d33a61ef2b29bd54..78b49725bdacb9307aa0f25718517b5c5d882f24 100644 (file)
--- a/ipif/Makefile
+++ b/ipif/Makefile
@@ -24,7 +24,8 @@
 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
@@ -36,8 +37,8 @@ TARGETS+=             $(PROGRAM_TARGETS)
 PROGRAMS$(depr)+=      udptunnel
 PROGRAMS+=             $(PROGRAM_TARGETS)
 
-DIRS+=                 $(libuserv)
-DIRS$(depr)+=          $(bindir) $(services) $(varlibvpn) $(shareuserv)
+DIRS+=                 $(libuserv) $(etcuserv) $(services)
+DIRS$(depr)+=          $(bindir) $(varlibvpn) $(shareuserv)
 
 SHAREFILES$(depr)+=    udptunnel-vpn-config.m4 udptunnel-vpn-defaults
 
@@ -49,7 +50,7 @@ OBJS_BFTEST=  blowfishtest.o blowfish.o hex.o
 
 all:           $(TARGETS)
 
-install:       installdirs all
+install:       all
                mkdir -p $(DIRS)
                cp -b service $(libuserv)/ipif
                set -e; for f in $(PROGRAMS); do cp -b $$f $(bindir)/.; done