svn commit: samba r19459 - in branches/SAMBA_4_0/source/lib/ldb: .

idra at samba.org idra at samba.org
Sun Oct 22 22:06:09 GMT 2006


Author: idra
Date: 2006-10-22 22:06:08 +0000 (Sun, 22 Oct 2006)
New Revision: 19459

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19459

Log:

Do not build nss by default (it probably works only on linux)
Fix warning with standalone.sh if build exists


Modified:
   branches/SAMBA_4_0/source/lib/ldb/Makefile.in
   branches/SAMBA_4_0/source/lib/ldb/standalone.sh


Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/Makefile.in
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/Makefile.in	2006-10-22 21:30:12 UTC (rev 19458)
+++ branches/SAMBA_4_0/source/lib/ldb/Makefile.in	2006-10-22 22:06:08 UTC (rev 19459)
@@ -57,8 +57,13 @@
 
 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:'
 	@echo '  CFLAGS = $(CFLAGS)'

Modified: branches/SAMBA_4_0/source/lib/ldb/standalone.sh
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/standalone.sh	2006-10-22 21:30:12 UTC (rev 19458)
+++ branches/SAMBA_4_0/source/lib/ldb/standalone.sh	2006-10-22 22:06:08 UTC (rev 19459)
@@ -14,8 +14,9 @@
 
 ./autogen.sh
 
-mkdir build
-cd  build
+mkdir -p build
+cd build
 
 ../configure
-make
+make dirs
+make all



More information about the samba-cvs mailing list