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

[tridge at samba.org]

Author: tridge
Date: 2006-08-22 04:19:40 +0000 (Tue, 22 Aug 2006)
New Revision: 17692

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

Log:

- don't try and run ldap tests unless we have slapd
- fix manpages install

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


Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/Makefile.in
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/Makefile.in	2006-08-22 04:15:39 UTC (rev 17691)
+++ branches/SAMBA_4_0/source/lib/ldb/Makefile.in	2006-08-22 04:19:40 UTC (rev 17692)
@@ -13,6 +13,7 @@
 builddir = @builddir@
 WITH_GCOV = @WITH_GCOV@
 WITH_LDAP = @WITH_LDAP@
+SLAPD = @SLAPD@
 WITH_SQLITE3 = @WITH_SQLITE3@
 
 ifeq ($(WITH_LDAP),yes)
@@ -78,7 +79,7 @@
 
 LIBS = $(LDB_LIB)($(OBJS))
 
-MANPAGES = $(patsubst %.xml,%,$(wildcard man/*.xml))
+MANPAGES = $(patsubst %.xml,%,$(wildcard $(srcdir)/man/*.xml))
 
 EXAMPLES = examples/ldbreader examples/ldifreader
 
@@ -122,7 +123,7 @@
 
 examples/ldbreader: examples/ldbreader.o $(LIBS)
 	$(CC) -o examples/ldbreader examples/ldbreader.o $(LIB_FLAGS)
- 
+
 examples/ldifreader: examples/ldifreader.o $(LIBS)
 	$(CC) -o examples/ldifreader examples/ldifreader.o $(LIB_FLAGS)
 
@@ -166,7 +167,7 @@
 ifeq ($(WITH_LDAP),yes)
 test-ldap:
 	@echo "STARTING LDAP BACKEND TEST"
-	$(srcdir)/tests/test-ldap.sh
+	if test -x "$(SLAPD)"; then $(srcdir)/tests/test-ldap.sh; fi
 else
 test-ldap:
 	@echo "SKIP LDAP TEST - NO LDAP SUPPORT"
@@ -194,8 +195,8 @@
 
 install: all
 	mkdir -p $(includedir) $(libdir)/pkgconfig $(libdir) $(bindir)
-	mkdir -p $(mandir) $(mandir)/man3
-	cp include/ldb.h include/ldb_errors.h $(includedir)
+	mkdir -p $(mandir) $(mandir)/man3 $(mandir)/man1
+	cp $(srcdir)/include/ldb.h $(srcdir)/include/ldb_errors.h $(includedir)
 	cp $(LDB_LIB) $(libdir)
 	cp $(BINS) $(bindir)
 	cp ldb.pc $(libdir)/pkgconfig