diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2013-12-04 19:14:30 +0000 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2013-12-04 19:14:30 +0000 |
| commit | 5e8cb121d0061bf38eb33be82b0b026ddafeda63 (patch) | |
| tree | 60d6ccb425206359b7acc07fa9c59ce380800449 | |
| parent | 97f318e04ed0024b2bf5903215a75249401d3fd7 (diff) | |
| download | userv-utils-5e8cb121d0061bf38eb33be82b0b026ddafeda63.tar.gz | |
ipif: Fix deprecation of udptunnel so it builds
| -rwxr-xr-x | debian/rules | 2 | ||||
| -rw-r--r-- | ipif/Makefile | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/debian/rules b/debian/rules index dbe4360..49c2f01 100755 --- 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 0addd4d..78b4972 100644 --- 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 |