diff options
| author | Andrew Tridgell <tridge@samba.org> | 2006-08-22 04:19:40 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:16:25 -0500 |
| commit | be99212aecc4ae0f2d0c11fd02c2a8c07b7bf65c (patch) | |
| tree | f25d3c9beceb4fb3b55a0a1d333c2b1701808cac /source4/lib/ldb | |
| parent | 3e83b0fac4e0202e2d111f76fc0071b834058468 (diff) | |
| download | samba-be99212aecc4ae0f2d0c11fd02c2a8c07b7bf65c.tar.gz samba-be99212aecc4ae0f2d0c11fd02c2a8c07b7bf65c.tar.bz2 samba-be99212aecc4ae0f2d0c11fd02c2a8c07b7bf65c.zip | |
r17692: - don't try and run ldap tests unless we have slapd
- fix manpages install
(This used to be commit 9bc751d1f18be1b03e47412e94abe6390f752f98)
Diffstat (limited to 'source4/lib/ldb')
| -rw-r--r-- | source4/lib/ldb/Makefile.in | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/source4/lib/ldb/Makefile.in b/source4/lib/ldb/Makefile.in index bd0f461a43..1e19e9bd49 100644 --- a/source4/lib/ldb/Makefile.in +++ b/source4/lib/ldb/Makefile.in @@ -13,6 +13,7 @@ srcdir = @srcdir@ builddir = @builddir@ WITH_GCOV = @WITH_GCOV@ WITH_LDAP = @WITH_LDAP@ +SLAPD = @SLAPD@ WITH_SQLITE3 = @WITH_SQLITE3@ ifeq ($(WITH_LDAP),yes) @@ -78,7 +79,7 @@ BINS = bin/ldbadd bin/ldbsearch bin/ldbdel bin/ldbmodify bin/ldbedit bin/ldbrena 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 @@ bin/oLschema2ldif: tools/oLschema2ldif.o tools/cmdline.o tools/convert.o $(LIBS) 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 @@ test-tdb: $(BINS) 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 @@ test: $(BINS) test-tdb test-ldap test-sqlite3 test-schema 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 |