-allow installation even as non-root non-sudo user to succeed with new nss code

2 files changed, 8 insertions, 3 deletions

diff --git a/src/gns/nss/Makefile.am b/src/gns/nss/Makefile.am
index c5e415dbf..582aa0696 100644
--- a/src/gns/nss/Makefile.am
+++ b/src/gns/nss/Makefile.am
@@ -21,15 +21,22 @@ EXTRA_DIST = map-file
 
 AM_LDFLAGS=-avoid-version -module -export-dynamic
 
+if HAVE_SUDO
 nssdir = /lib/
+else
+nssdir = $(libdir)
+endif
+
 LIBTOOL = $(SUDO_BINARY) $(SHELL) $(top_builddir)/libtool
 
 if !MINGW
+if HAVE_SUDO
 nss_LTLIBRARIES = \
         libnss_gns.la \
         libnss_gns4.la \
         libnss_gns6.la
 endif
+endif
 
 sources = util.c util.h query.h query.c
 
diff --git a/src/integration-tests/Makefile.am b/src/integration-tests/Makefile.am
index 7c1991b91..f9998642d 100644
--- a/src/integration-tests/Makefile.am
+++ b/src/integration-tests/Makefile.am
@@ -12,8 +12,6 @@ endif
 #bin_PROGRAMS = \
 # connection_watchdog
 
-check_PROGRAMS =
-
 noinst_PROGRAMS = connection_watchdog
 
 noinst_SCRIPTS = \
@@ -98,7 +96,7 @@ test_integration_clique.py: test_integration_clique.py.in Makefile
 test_integration_clique_nat.py: test_integration_clique_nat.py.in Makefile
         $(do_subst) < $(srcdir)/test_integration_clique_nat.py.in > test_integration_clique_nat.py
         chmod +x test_integration_clique_nat.py 
-        
+
 test_integration_connect_on_restart.py: test_integration_connect_on_restart.py.in Makefile
         $(do_subst) < $(srcdir)/test_integration_connect_on_restart.py.in > test_integration_connect_on_restart.py
         chmod +x test_integration_connect_on_restart.py