diff options
author | Martin Schanzenbach <schanzen@gnunet.org> | 2023-01-05 21:14:48 +0900 |
---|---|---|
committer | Martin Schanzenbach <schanzen@gnunet.org> | 2023-01-05 21:14:48 +0900 |
commit | bda28efd1fb37e08ce6cf04e9c503ec3d3f2ad1e (patch) | |
tree | aed5ce2384fad281fd060bc2d93c78c0eab34d27 | |
parent | 8240cf2105746c0d280297995b541568afcdd6bd (diff) | |
download | gnunet-bda28efd1fb37e08ce6cf04e9c503ec3d3f2ad1e.tar.gz gnunet-bda28efd1fb37e08ce6cf04e9c503ec3d3f2ad1e.zip |
BUILD: Properly set installation directories for gnunet-suidfix and gnunet-bcd
-rw-r--r-- | contrib/scripts/Makefile.am | 1 | ||||
-rw-r--r-- | src/gns/Makefile.am | 13 |
2 files changed, 7 insertions, 7 deletions
diff --git a/contrib/scripts/Makefile.am b/contrib/scripts/Makefile.am index 3198e26f8..4cbf955bf 100644 --- a/contrib/scripts/Makefile.am +++ b/contrib/scripts/Makefile.am | |||
@@ -1,5 +1,6 @@ | |||
1 | # This Makefile.am is in the public domain | 1 | # This Makefile.am is in the public domain |
2 | AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include | 2 | AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include |
3 | libexecdir= $(pkglibdir)/libexec/ | ||
3 | 4 | ||
4 | SUBDIRS = gnunet-logread | 5 | SUBDIRS = gnunet-logread |
5 | 6 | ||
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am index 2fbb49b18..a164efee1 100644 --- a/src/gns/Makefile.am +++ b/src/gns/Makefile.am | |||
@@ -42,14 +42,9 @@ dist_pkgcfg_DATA = \ | |||
42 | lib_LTLIBRARIES = \ | 42 | lib_LTLIBRARIES = \ |
43 | libgnunetgns.la | 43 | libgnunetgns.la |
44 | 44 | ||
45 | if HAVE_GNUTLS | ||
46 | DO_PROXY=gnunet-gns-proxy | ||
47 | endif | ||
48 | |||
49 | libexec_PROGRAMS = \ | 45 | libexec_PROGRAMS = \ |
50 | gnunet-service-gns \ | 46 | gnunet-service-gns \ |
51 | gnunet-dns2gns \ | 47 | gnunet-dns2gns |
52 | $(DO_PROXY) | ||
53 | 48 | ||
54 | bin_PROGRAMS = \ | 49 | bin_PROGRAMS = \ |
55 | gnunet-gns | 50 | gnunet-gns |
@@ -58,7 +53,11 @@ noinst_PROGRAMS = \ | |||
58 | gnunet-gns-benchmark | 53 | gnunet-gns-benchmark |
59 | 54 | ||
60 | if HAVE_PDFLATEX | 55 | if HAVE_PDFLATEX |
61 | bin_PROGRAMS += gnunet-bcd | 56 | libexec_PROGRAMS += gnunet-bcd |
57 | endif | ||
58 | |||
59 | if HAVE_GNUTLS | ||
60 | libexec_PROGRAMS += gnunet-gns-proxy | ||
62 | endif | 61 | endif |
63 | 62 | ||
64 | REST_PLUGIN = libgnunet_plugin_rest_gns.la | 63 | REST_PLUGIN = libgnunet_plugin_rest_gns.la |