summaryrefslogtreecommitdiff
path: root/src/vpn/Makefile.am
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2012-10-29 16:14:03 +0000
committerChristian Grothoff <christian@grothoff.org>2012-10-29 16:14:03 +0000
commitbcbcf005b4864ac5557c31da10521126d8880849 (patch)
tree444cafefb16e1c5a4ba13ce2db07d6ec1f37675e /src/vpn/Makefile.am
parent119193d6350bbbd8c6ecbd60ccc8301223d6f6d6 (diff)
installing all service, daemon and helper binaries to lib/gnunet/libexec/; updating code to run binaries from new location, which is no longer in PATH
Diffstat (limited to 'src/vpn/Makefile.am')
-rw-r--r--src/vpn/Makefile.am10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/vpn/Makefile.am b/src/vpn/Makefile.am
index e7802bc9a..453b3b908 100644
--- a/src/vpn/Makefile.am
+++ b/src/vpn/Makefile.am
@@ -10,6 +10,8 @@ endif
pkgcfgdir= $(pkgdatadir)/config.d/
+libexecdir= $(pkglibdir)/libexec/
+
plugindir = $(libdir)/gnunet
pkgcfg_DATA = \
@@ -18,7 +20,7 @@ pkgcfg_DATA = \
if LINUX
VPNBIN = gnunet-helper-vpn
install-exec-hook:
- $(top_srcdir)/src/vpn/install-vpn-helper.sh $(bindir) $(SUDO_BINARY) || true
+ $(top_srcdir)/src/vpn/install-vpn-helper.sh $(libexecdir) $(SUDO_BINARY) || true
else
install-exec-hook:
endif
@@ -28,8 +30,12 @@ lib_LTLIBRARIES = \
libgnunetvpn.la
+libexec_PROGRAMS = \
+ $(VPNBIN) \
+ gnunet-service-vpn
+
bin_PROGRAMS = \
- $(VPNBIN) gnunet-service-vpn gnunet-vpn
+ gnunet-vpn
gnunet_helper_vpn_SOURCES = \
gnunet-helper-vpn.c