From fb5a4bff07c34012cc188ff5d8c3d174e9d8c131 Mon Sep 17 00:00:00 2001 From: ng0 Date: Wed, 23 Oct 2019 20:24:46 +0000 Subject: first test commit to make sudo + sh scripts obsolete. install(1) is too unportable to handle this job so we take the content of the scripts. --- src/nat/Makefile.am | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src/nat/Makefile.am') 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 NATSERVER = gnunet-helper-nat-server.c NATCLIENT = gnunet-helper-nat-client.c install-exec-hook: - $(top_srcdir)/src/nat/install-nat-helper.sh $(DESTDIR)$(libexecdir) $(SUDO_OR_DOAS_BINARY) || true + chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-nat-server + chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-nat-client + chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-nat-server + chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-nat-client else if XFREEBSD NATBIN = gnunet-helper-nat-server gnunet-helper-nat-client NATSERVER = gnunet-helper-nat-server.c NATCLIENT = gnunet-helper-nat-client.c install-exec-hook: - $(top_srcdir)/src/nat/install-nat-helper.sh $(DESTDIR)$(libexecdir) $(SUDO_OR_DOAS_BINARY) || true + chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-nat-server + chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-nat-client + chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-nat-server + chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-nat-client endif else install-exec-hook: @@ -61,7 +67,7 @@ if USE_COVERAGE endif lib_LTLIBRARIES = \ - libgnunetnatnew.la + libgnunetnatnew.la libgnunetnatnew_la_SOURCES = \ nat_api.c \ -- cgit v1.2.3