[GNUnet-SVN] r35924 - gnunet/src/gns/nss

[gnunet]

Author: burdges
Date: 2015-06-11 19:29:54 +0200 (Thu, 11 Jun 2015)
New Revision: 35924

Modified:
   gnunet/src/gns/nss/Makefile.am
Log:
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.




Modified: gnunet/src/gns/nss/Makefile.am
===================================================================
--- gnunet/src/gns/nss/Makefile.am      2015-06-10 14:16:02 UTC (rev 35923)
+++ gnunet/src/gns/nss/Makefile.am      2015-06-11 17:29:54 UTC (rev 35924)
@@ -26,7 +26,7 @@
 
 nssdir = $(NSS_DIR)
 
-LIBTOOL = $(SUDO_BINARY) $(SHELL) $(top_builddir)/libtool
+LIBTOOL = $(LIBTOOL_SUDO_BINARY) $(SHELL) $(top_builddir)/libtool
 
 if !MINGW
 if INSTALL_NSS
@@ -34,6 +34,11 @@
        libnss_gns.la \
        libnss_gns4.la \
        libnss_gns6.la
+
+install-nssLTLIBRARIES:
+       LIBTOOL_SUDO_BINARY = $(SUDO_BINARY)
+uninstall-nssLTLIBRARIES:
+       LIBTOOL_SUDO_BINARY = $(SUDO_BINARY)
 endif
 endif
 
@@ -62,4 +67,4 @@
        $(top_srcdir)/src/gns/nss/uninstall-nss-plugin.sh $(SHELL) 
$(top_builddir) "rm -f $(nssdir)/libnss_gns4.so.2" $(SUDO_BINARY)
        $(top_srcdir)/src/gns/nss/uninstall-nss-plugin.sh $(SHELL) 
$(top_builddir) "rm -f $(nssdir)/libnss_gns6.so.2" $(SUDO_BINARY)
 endif
-endif
\ No newline at end of file
+endif