~mdw
/
userv-utils
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ipif: Introduce eat_optionalstr (and make protocol optional)
[userv-utils]
/
ipif
/
Makefile
diff --git
a/ipif/Makefile
b/ipif/Makefile
index
0addd4d
..
fe6ec6e
100644
(file)
--- a/
ipif/Makefile
+++ b/
ipif/Makefile
@@
-24,7
+24,8
@@
include ../settings.make
varlibvpn= $(varlibuserv)/vpn
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
PROGRAM_TARGETS+=
PROGRAM_TARGETS$(depr)+= udptunnel-forwarder udptunnel-reconf
@@
-36,8
+37,9
@@
TARGETS+= $(PROGRAM_TARGETS)
PROGRAMS$(depr)+= udptunnel
PROGRAMS+= $(PROGRAM_TARGETS)
PROGRAMS$(depr)+= udptunnel
PROGRAMS+= $(PROGRAM_TARGETS)
-DIRS+= $(libuserv)
-DIRS$(depr)+= $(bindir) $(services) $(varlibvpn) $(shareuserv)
+DIRS+= $(libuserv) $(etcuserv) $(services)
+DIRS+= $(docdir)/userv-ipif
+DIRS$(depr)+= $(bindir) $(varlibvpn) $(shareuserv)
SHAREFILES$(depr)+= udptunnel-vpn-config.m4 udptunnel-vpn-defaults
SHAREFILES$(depr)+= udptunnel-vpn-config.m4 udptunnel-vpn-defaults
@@
-49,7
+51,7
@@
OBJS_BFTEST= blowfishtest.o blowfish.o hex.o
all: $(TARGETS)
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
mkdir -p $(DIRS)
cp -b service $(libuserv)/ipif
set -e; for f in $(PROGRAMS); do cp -b $$f $(bindir)/.; done
@@
-58,6
+60,7
@@
install: installdirs all
set -e; for f in $(SHAREFILES); do cp $$f $(shareuserv)/.; done
install-docs:
set -e; for f in $(SHAREFILES); do cp $$f $(shareuserv)/.; done
install-docs:
+ sed -n '1,/^$$/p' service.c >$(docdir)/userv-ipif/service.c.txt
install-examples:
set -e; if [ "x$depr" = x ]; then \
install-examples:
set -e; if [ "x$depr" = x ]; then \