-fix leaks

[oweals/gnunet.git] / src / gns / nss / Makefile.am

diff --git a/src/gns/nss/Makefile.am b/src/gns/nss/Makefile.am
index c5e415dbfde01beb81d867e5deeb235abe3f8fbc..64bc813497b3a92153458c57a46a47cd4bcce9b9 100644 (file)
--- a/src/gns/nss/Makefile.am
+++ b/src/gns/nss/Makefile.am
@@ -3,8 +3,8 @@
 # This file taken and modified from nss-gns.
 #
 # nss-gns is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2 of the
+# under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 3 of the
 # License, or (at your option) any later version.
 #
 # nss-gns is distributed in the hope that it will be useful, but
@@ -17,21 +17,26 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
-EXTRA_DIST = map-file
+EXTRA_DIST = map-file \
+  install-nss-plugin.sh \
+  uninstall-nss-plugin.sh
 
 AM_LDFLAGS=-avoid-version -module -export-dynamic
 
-nssdir = /lib/
+nssdir = $(NSS_DIR)
+
 LIBTOOL = $(SUDO_BINARY) $(SHELL) $(top_builddir)/libtool
 
 if !MINGW
+if INSTALL_NSS
 nss_LTLIBRARIES = \
        libnss_gns.la \
        libnss_gns4.la \
        libnss_gns6.la
 endif
+endif
 
-sources = util.c util.h query.h query.c
+sources = nss_gns_query.h nss_gns_query.c
 
 # GNU Libc
 libnss_gns_la_SOURCES= $(sources) nss_gns.c
@@ -46,9 +51,12 @@ 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 !MINGW
 install-data-hook:
-       $(SUDO_BINARY) $(SHELL) $(top_builddir)/libtool --finish $(nssdir)
-       $(SUDO_BINARY) rm -f $(nssdir)/libnss_gns.la $(nssdir)/libnss_gns4.la $(nssdir)/libnss_gns6.la 
+       $(top_srcdir)/src/gns/nss/install-nss-plugin.sh $(SHELL) $(top_builddir) $(nssdir) $(SUDO_BINARY)
 
 uninstall-hook:
-       $(SUDO_BINARY) rm -f $(nssdir)/libnss_gns.so.2 $(nssdir)/libnss_gns4.so.2 $(nssdir)/libnss_gns6.so.2 
+       $(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