diff options
-rw-r--r-- | src/dns/Makefile.am | 7 | ||||
-rw-r--r-- | src/exit/Makefile.am | 3 | ||||
-rw-r--r-- | src/nat/Makefile.am | 12 | ||||
-rw-r--r-- | src/transport/Makefile.am | 6 | ||||
-rw-r--r-- | src/vpn/Makefile.am | 3 |
5 files changed, 23 insertions, 8 deletions
diff --git a/src/dns/Makefile.am b/src/dns/Makefile.am index acf9660f7..8082cbab5 100644 --- a/src/dns/Makefile.am +++ b/src/dns/Makefile.am | |||
@@ -25,7 +25,12 @@ endif | |||
25 | if LINUX | 25 | if LINUX |
26 | HIJACKBIN = gnunet-helper-dns | 26 | HIJACKBIN = gnunet-helper-dns |
27 | install-exec-hook: | 27 | install-exec-hook: |
28 | $(top_srcdir)/src/dns/install-dns-helper.sh $(DESTDIR)$(libexecdir) $(GNUNETDNS_GROUP) $(SUDO_OR_DOAS_BINARY) || true | 28 | chown root $(DESTDIR)$(libexecdir)/gnunt-helper-dns |
29 | chgrp $(GNUNETDNS_GROUP) $(DESTDIR)$(libexecdir)/gnunt-helper-dns | ||
30 | chmod 4750 $(DESTDIR)$(libexecdir)/gnunt-helper-dns | ||
31 | chgrp $(GNUNETDNS_GROUP) $(DESTDIR)$(libexecdir)/gnunt-helper-dns | ||
32 | chown gnunet:$(GNUNETDNS_GROUP) $(DESTDIR)$(libexecdir)/gnunt-helper-dns | ||
33 | chmod 2750 $(DESTDIR)$(libexecdir)/gnunt-helper-dns | ||
29 | else | 34 | else |
30 | install-exec-hook: | 35 | install-exec-hook: |
31 | endif | 36 | endif |
diff --git a/src/exit/Makefile.am b/src/exit/Makefile.am index bca0f1d9f..c45354256 100644 --- a/src/exit/Makefile.am +++ b/src/exit/Makefile.am | |||
@@ -25,7 +25,8 @@ endif | |||
25 | if LINUX | 25 | if LINUX |
26 | EXITBIN = gnunet-helper-exit | 26 | EXITBIN = gnunet-helper-exit |
27 | install-exec-hook: | 27 | install-exec-hook: |
28 | $(top_srcdir)/src/exit/install-exit-helper.sh $(DESTDIR)$(libexecdir) $(SUDO_OR_DOAS_BINARY) || true | 28 | chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-exit |
29 | chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-exit | ||
29 | else | 30 | else |
30 | install-exec-hook: | 31 | install-exec-hook: |
31 | endif | 32 | endif |
diff --git a/src/nat/Makefile.am b/src/nat/Makefile.am index d88dd6db4..2c04741da 100644 --- a/src/nat/Makefile.am +++ b/src/nat/Makefile.am | |||
@@ -21,14 +21,20 @@ if LINUX | |||
21 | NATSERVER = gnunet-helper-nat-server.c | 21 | NATSERVER = gnunet-helper-nat-server.c |
22 | NATCLIENT = gnunet-helper-nat-client.c | 22 | NATCLIENT = gnunet-helper-nat-client.c |
23 | install-exec-hook: | 23 | install-exec-hook: |
24 | $(top_srcdir)/src/nat/install-nat-helper.sh $(DESTDIR)$(libexecdir) $(SUDO_OR_DOAS_BINARY) || true | 24 | chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-nat-server |
25 | chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-nat-client | ||
26 | chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-nat-server | ||
27 | chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-nat-client | ||
25 | else | 28 | else |
26 | if XFREEBSD | 29 | if XFREEBSD |
27 | NATBIN = gnunet-helper-nat-server gnunet-helper-nat-client | 30 | NATBIN = gnunet-helper-nat-server gnunet-helper-nat-client |
28 | NATSERVER = gnunet-helper-nat-server.c | 31 | NATSERVER = gnunet-helper-nat-server.c |
29 | NATCLIENT = gnunet-helper-nat-client.c | 32 | NATCLIENT = gnunet-helper-nat-client.c |
30 | install-exec-hook: | 33 | install-exec-hook: |
31 | $(top_srcdir)/src/nat/install-nat-helper.sh $(DESTDIR)$(libexecdir) $(SUDO_OR_DOAS_BINARY) || true | 34 | chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-nat-server |
35 | chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-nat-client | ||
36 | chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-nat-server | ||
37 | chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-nat-client | ||
32 | endif | 38 | endif |
33 | else | 39 | else |
34 | install-exec-hook: | 40 | install-exec-hook: |
@@ -61,7 +67,7 @@ if USE_COVERAGE | |||
61 | endif | 67 | endif |
62 | 68 | ||
63 | lib_LTLIBRARIES = \ | 69 | lib_LTLIBRARIES = \ |
64 | libgnunetnatnew.la | 70 | libgnunetnatnew.la |
65 | 71 | ||
66 | libgnunetnatnew_la_SOURCES = \ | 72 | libgnunetnatnew_la_SOURCES = \ |
67 | nat_api.c \ | 73 | nat_api.c \ |
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index 178ecc737..b690fa345 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am | |||
@@ -103,9 +103,11 @@ endif | |||
103 | 103 | ||
104 | if LINUX | 104 | if LINUX |
105 | install-exec-hook: | 105 | install-exec-hook: |
106 | $(top_srcdir)/src/transport/install-wlan-helper.sh $(DESTDIR)$(libexecdir) $(SUDO_OR_DOAS_BINARY) || true | 106 | chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-transport-wlan |
107 | chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-transport-wlan | ||
107 | if HAVE_LIBBLUETOOTH | 108 | if HAVE_LIBBLUETOOTH |
108 | $(top_srcdir)/src/transport/install-bluetooth-helper.sh $(DESTDIR)$(libexecdir) $(SUDO_OR_DOAS_BINARY) || true | 109 | chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-transport-bluetooth |
110 | chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-transport-bluetooth | ||
109 | endif | 111 | endif |
110 | else | 112 | else |
111 | install-exec-hook: | 113 | install-exec-hook: |
diff --git a/src/vpn/Makefile.am b/src/vpn/Makefile.am index 4d7ca087e..9992fa5ed 100644 --- a/src/vpn/Makefile.am +++ b/src/vpn/Makefile.am | |||
@@ -25,7 +25,8 @@ endif | |||
25 | if LINUX | 25 | if LINUX |
26 | VPNBIN = gnunet-helper-vpn | 26 | VPNBIN = gnunet-helper-vpn |
27 | install-exec-hook: | 27 | install-exec-hook: |
28 | $(top_srcdir)/src/vpn/install-vpn-helper.sh $(DESTDIR)$(libexecdir) $(SUDO_OR_DOAS_BINARY) || true | 28 | chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-vpn |
29 | chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-vpn | ||
29 | else | 30 | else |
30 | install-exec-hook: | 31 | install-exec-hook: |
31 | endif | 32 | endif |