aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJeff Burdges <burdges@gnunet.org>2015-06-11 17:29:54 +0000
committerJeff Burdges <burdges@gnunet.org>2015-06-11 17:29:54 +0000
commit143dd2c94830367338171222a2452d5e62c82a53 (patch)
treeaf65e0d3433c35706d15f1eb841d190fdf2d7d04 /src
parentc3cacca6dd36f695334f9b6cfba0973a63104a23 (diff)
downloadgnunet-143dd2c94830367338171222a2452d5e62c82a53.tar.gz
gnunet-143dd2c94830367338171222a2452d5e62c82a53.zip
I'm unsure if I've correctly tested it in the odd build enviroment
for which it was create. We should use GNU make's target specific variables to ensure libtool is run as root only during instalation to, and removal from, /lib of the NSS plugins. See : https://www.gnu.org/software/make/manual/make.html#Target_002dspecific If you've previously been using the --with-sudo=sudo option then you must run sudo make clean becuase the .libs directory maintained by libtool will be owned by root.
Diffstat (limited to 'src')
-rw-r--r--src/gns/nss/Makefile.am9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/gns/nss/Makefile.am b/src/gns/nss/Makefile.am
index d0fd51bbe..e17c7fa3f 100644
--- a/src/gns/nss/Makefile.am
+++ b/src/gns/nss/Makefile.am
@@ -26,7 +26,7 @@ AM_LDFLAGS=-avoid-version -module -export-dynamic
26 26
27nssdir = $(NSS_DIR) 27nssdir = $(NSS_DIR)
28 28
29LIBTOOL = $(SUDO_BINARY) $(SHELL) $(top_builddir)/libtool 29LIBTOOL = $(LIBTOOL_SUDO_BINARY) $(SHELL) $(top_builddir)/libtool
30 30
31if !MINGW 31if !MINGW
32if INSTALL_NSS 32if INSTALL_NSS
@@ -34,6 +34,11 @@ nss_LTLIBRARIES = \
34 libnss_gns.la \ 34 libnss_gns.la \
35 libnss_gns4.la \ 35 libnss_gns4.la \
36 libnss_gns6.la 36 libnss_gns6.la
37
38install-nssLTLIBRARIES:
39 LIBTOOL_SUDO_BINARY = $(SUDO_BINARY)
40uninstall-nssLTLIBRARIES:
41 LIBTOOL_SUDO_BINARY = $(SUDO_BINARY)
37endif 42endif
38endif 43endif
39 44
@@ -62,4 +67,4 @@ uninstall-hook:
62 $(top_srcdir)/src/gns/nss/uninstall-nss-plugin.sh $(SHELL) $(top_builddir) "rm -f $(nssdir)/libnss_gns4.so.2" $(SUDO_BINARY) 67 $(top_srcdir)/src/gns/nss/uninstall-nss-plugin.sh $(SHELL) $(top_builddir) "rm -f $(nssdir)/libnss_gns4.so.2" $(SUDO_BINARY)
63 $(top_srcdir)/src/gns/nss/uninstall-nss-plugin.sh $(SHELL) $(top_builddir) "rm -f $(nssdir)/libnss_gns6.so.2" $(SUDO_BINARY) 68 $(top_srcdir)/src/gns/nss/uninstall-nss-plugin.sh $(SHELL) $(top_builddir) "rm -f $(nssdir)/libnss_gns6.so.2" $(SUDO_BINARY)
64endif 69endif
65endif \ No newline at end of file 70endif