From e0e8fc3db45691160b629b0a43753c162be03490 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 5 May 2007 18:59:52 +0000 Subject: r22682: Fix standalone ldb build when parent directory name != ldb. (This used to be commit 532f28724dcc9e0fe7051e27d145469398041101) --- source4/lib/ldb/tools/cmdline.c | 6 +++--- source4/lib/ldb/tools/ldbadd.c | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/source4/lib/ldb/tools/cmdline.c b/source4/lib/ldb/tools/cmdline.c index c0de314ef1..7589c159d8 100644 --- a/source4/lib/ldb/tools/cmdline.c +++ b/source4/lib/ldb/tools/cmdline.c @@ -22,11 +22,11 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "includes.h" -#include "ldb/include/includes.h" -#include "ldb/tools/cmdline.h" +#include "ldb_includes.h" +#include "tools/cmdline.h" #if (_SAMBA_BUILD_ >= 4) +#include "includes.h" #include "lib/cmdline/popt_common.h" #include "lib/ldb/samba/ldif_handlers.h" #include "auth/gensec/gensec.h" diff --git a/source4/lib/ldb/tools/ldbadd.c b/source4/lib/ldb/tools/ldbadd.c index 8e75bccacc..93147dc715 100644 --- a/source4/lib/ldb/tools/ldbadd.c +++ b/source4/lib/ldb/tools/ldbadd.c @@ -32,9 +32,8 @@ * Author: Andrew Tridgell */ -#include "includes.h" -#include "ldb/include/includes.h" -#include "ldb/tools/cmdline.h" +#include "ldb_includes.h" +#include "tools/cmdline.h" static int failures; -- cgit