diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-10-29 16:14:03 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-10-29 16:14:03 +0000 |
commit | bcbcf005b4864ac5557c31da10521126d8880849 (patch) | |
tree | 444cafefb16e1c5a4ba13ce2db07d6ec1f37675e /src/vpn | |
parent | 119193d6350bbbd8c6ecbd60ccc8301223d6f6d6 (diff) | |
download | gnunet-bcbcf005b4864ac5557c31da10521126d8880849.tar.gz gnunet-bcbcf005b4864ac5557c31da10521126d8880849.zip |
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')
-rw-r--r-- | src/vpn/Makefile.am | 10 |
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 | |||
10 | 10 | ||
11 | pkgcfgdir= $(pkgdatadir)/config.d/ | 11 | pkgcfgdir= $(pkgdatadir)/config.d/ |
12 | 12 | ||
13 | libexecdir= $(pkglibdir)/libexec/ | ||
14 | |||
13 | plugindir = $(libdir)/gnunet | 15 | plugindir = $(libdir)/gnunet |
14 | 16 | ||
15 | pkgcfg_DATA = \ | 17 | pkgcfg_DATA = \ |
@@ -18,7 +20,7 @@ pkgcfg_DATA = \ | |||
18 | if LINUX | 20 | if LINUX |
19 | VPNBIN = gnunet-helper-vpn | 21 | VPNBIN = gnunet-helper-vpn |
20 | install-exec-hook: | 22 | install-exec-hook: |
21 | $(top_srcdir)/src/vpn/install-vpn-helper.sh $(bindir) $(SUDO_BINARY) || true | 23 | $(top_srcdir)/src/vpn/install-vpn-helper.sh $(libexecdir) $(SUDO_BINARY) || true |
22 | else | 24 | else |
23 | install-exec-hook: | 25 | install-exec-hook: |
24 | endif | 26 | endif |
@@ -28,8 +30,12 @@ lib_LTLIBRARIES = \ | |||
28 | libgnunetvpn.la | 30 | libgnunetvpn.la |
29 | 31 | ||
30 | 32 | ||
33 | libexec_PROGRAMS = \ | ||
34 | $(VPNBIN) \ | ||
35 | gnunet-service-vpn | ||
36 | |||
31 | bin_PROGRAMS = \ | 37 | bin_PROGRAMS = \ |
32 | $(VPNBIN) gnunet-service-vpn gnunet-vpn | 38 | gnunet-vpn |
33 | 39 | ||
34 | gnunet_helper_vpn_SOURCES = \ | 40 | gnunet_helper_vpn_SOURCES = \ |
35 | gnunet-helper-vpn.c | 41 | gnunet-helper-vpn.c |