r19459: Do not build nss by default (it probably works only on linux)

Fix warning with standalone.sh if build exists
(This used to be commit d74fac574067ff2f3918ad435df2c2352e4b2ef7)

diff --git a/source4/lib/ldb/Makefile.in b/source4/lib/ldb/Makefile.in
index c90f41afd79731c219d187d9c7cb51aab6c6b015..b46fd73791e30a5b62964bc7e859ba6ad6f857ff 100644 (file)
--- a/source4/lib/ldb/Makefile.in
+++ b/source4/lib/ldb/Makefile.in
@@ -57,7 +57,12 @@ EXAMPLES = examples/ldbreader examples/ldifreader
 
 DIRS = lib bin common ldb_tdb ldb_ldap ldb_sqlite3 modules tools examples
 
-all: showflags dirs $(OBJS) $(LDB_LIB) $(BINS) $(EXAMPLES) manpages $(NSS_LIB)
+nss: nssdir $(NSS_LIB)
+
+nssdir:
+       @mkdir -p $(NSSDIR)
+
+all: showflags dirs $(OBJS) $(LDB_LIB) $(BINS) $(EXAMPLES) manpages
 
 showflags:
        @echo 'ldb will be compiled with flags:'

diff --git a/source4/lib/ldb/standalone.sh b/source4/lib/ldb/standalone.sh
index 4a085688c256534ddaa5aea6bae1b1a735e437c1..1c5d5f7e4f33cb762f3698e2775b0ba0680455b5 100755 (executable)
--- a/source4/lib/ldb/standalone.sh
+++ b/source4/lib/ldb/standalone.sh
@@ -14,8 +14,9 @@ make clean
 
 ./autogen.sh
 
-mkdir build
-cd  build
+mkdir -p build
+cd build
 
 ../configure
-make
+make dirs
+make all