simplify installation of nss plugins in build system, require user(s) to move plugins into place manually (#5078)

3 files changed, 2 insertions, 40 deletions

diff --git a/src/gns/nss/Makefile.am b/src/gns/nss/Makefile.am
index 2551b9562..5d42f777f 100644
--- a/src/gns/nss/Makefile.am
+++ b/src/gns/nss/Makefile.am
@@ -18,28 +18,17 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
 # USA.
 
-EXTRA_DIST = map-file \
-  install-nss-plugin.sh \
-  uninstall-nss-plugin.sh
+EXTRA_DIST = map-file 
 
 AM_LDFLAGS=-avoid-version -module -export-dynamic
 
-nssdir = $(NSS_DIR)
-
-LIBTOOL = $(LIBTOOL_SUDO_BINARY) $(SHELL) $(top_builddir)/libtool
+nssdir = $(libdir)/gnunet/nss
 
 if !MINGW
-if INSTALL_NSS
 nss_LTLIBRARIES = \
         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
 
 sources = nss_gns_query.h nss_gns_query.c
@@ -57,14 +46,3 @@ libnss_gns6_la_SOURCES=$(libnss_gns_la_SOURCES)
 libnss_gns6_la_CFLAGS=$(libnss_gns_la_CFLAGS) -DNSS_IPV6_ONLY=1
 libnss_gns6_la_LDFLAGS=$(libnss_gns_la_LDFLAGS)
 
-if INSTALL_NSS
-if !MINGW
-install-data-hook:
-        $(top_srcdir)/src/gns/nss/install-nss-plugin.sh $(SHELL) $(top_builddir) $(DESTDIR)$(nssdir) $(SUDO_BINARY)
-
-uninstall-hook:
-        $(top_srcdir)/src/gns/nss/uninstall-nss-plugin.sh $(SHELL) $(top_builddir) "rm -f $(nssdir)/libnss_gns.so.2" $(SUDO_BINARY)
-        $(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
diff --git a/src/gns/nss/install-nss-plugin.sh b/src/gns/nss/install-nss-plugin.sh
deleted file mode 100755
index 1aab8ca69..000000000
--- a/src/gns/nss/install-nss-plugin.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-# $1 - shell
-# $2 - top_builddir
-# $3 - nssdir
-# $4 - sudo binary (empty if root)
-$4 $1 $2/libtool --mode=finish $3
-echo LTINST: $4 $1 $2/libtool --mode=finish $3
-$4 rm -f $3/libnss_gns.la $3/libnss_gns4.la $3/libnss_gns6.la
diff --git a/src/gns/nss/uninstall-nss-plugin.sh b/src/gns/nss/uninstall-nss-plugin.sh
deleted file mode 100755
index 3d8cec110..000000000
--- a/src/gns/nss/uninstall-nss-plugin.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-# $1 - shell
-# $2 - top_builddir
-# $3 - nssdir+path of library to remove
-# $4 - sudo binary (empty if root)
-$4 $1 $2/libtool --mode=uninstall $3
-
-