r22682: Fix standalone ldb build when parent directory name != ldb.

(This used to be commit 532f28724dcc9e0fe7051e27d145469398041101)

diff --git a/source4/lib/ldb/tools/cmdline.c b/source4/lib/ldb/tools/cmdline.c
index c0de314ef187d24ee1fadfd596ca3135f29730de..7589c159d8a00669dfe8d7d7940b2c2eacf62bf8 100644 (file)
--- 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 8e75bccacc40237ccd596b85a8529a4dcdb787be..93147dc71591806520d7123a4534daf359d726c5 100644 (file)
--- 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;