[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha4-115-g7876060

[Jelmer Vernooij]

The branch, v4-0-test has been updated
       via  78760606fa71c370ae3c05b077c5146166bdaa7b (commit)
       via  6416b637ea6570edd27eb8ef3005c408d311f3a3 (commit)
      from  25f500d2233198b88c1d54268f5f6f461cea75d9 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit 78760606fa71c370ae3c05b077c5146166bdaa7b
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Wed Jun 25 20:04:35 2008 +0200

    Use variable for selftest directory.

commit 6416b637ea6570edd27eb8ef3005c408d311f3a3
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Wed Jun 25 19:58:41 2008 +0200

    Fix another reference to ldbdir.

-----------------------------------------------------------------------

Summary of changes:
 source/Makefile                    |    3 ++-
 source/lib/ldb/ldb_ildap/config.mk |    2 +-
 source/selftest/config.mk          |    2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/Makefile b/source/Makefile
index 1889ba2..8a8eef7 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -290,7 +290,8 @@ data.mk: config.status $(MK_FILES)
 testcov-html:: 
 
 include $(pidldir)/config.mk
-include $(srcdir)/selftest/config.mk
+selftestdir := $(srcdir)/selftest
+include $(selftestdir)/config.mk
 
 showflags::
 	@echo '  pwd        = '`/bin/pwd`
diff --git a/source/lib/ldb/ldb_ildap/config.mk b/source/lib/ldb/ldb_ildap/config.mk
index 99e101f..4247bd9 100644
--- a/source/lib/ldb/ldb_ildap/config.mk
+++ b/source/lib/ldb/ldb_ildap/config.mk
@@ -2,7 +2,7 @@
 # Start MODULE ldb_ildap
 [MODULE::ldb_ildap]
 SUBSYSTEM = LIBLDB
-CFLAGS = -I$(ldbdir)/include
+CFLAGS = -I$(ldbsrcdir)/include
 OUTPUT_TYPE = SHARED_LIBRARY
 PRIVATE_DEPENDENCIES = LIBTALLOC LIBCLI_LDAP CREDENTIALS
 ALIASES = ldapi ldaps ldap
diff --git a/source/selftest/config.mk b/source/selftest/config.mk
index 2ae49b2..871c148 100644
--- a/source/selftest/config.mk
+++ b/source/selftest/config.mk
@@ -1,6 +1,6 @@
 TEST_FORMAT = plain
 
-SELFTEST = $(LD_LIBPATH_OVERRIDE) $(PERL) $(srcdir)/selftest/selftest.pl --prefix=${selftest_prefix} \
+SELFTEST = $(LD_LIBPATH_OVERRIDE) $(PERL) $(selftestdir)/selftest.pl --prefix=${selftest_prefix} \
     --builddir=$(builddir) --srcdir=$(srcdir) \
     --expected-failures=$(srcdir)/samba4-knownfail \
 	--format=$(TEST_FORMAT) \


-- 
Samba Shared Repository