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

[jelmer at samba.org]

Author: jelmer
Date: 2007-05-05 18:59:52 +0000 (Sat, 05 May 2007)
New Revision: 22682

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

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

Modified:
   branches/SAMBA_4_0/source/lib/ldb/tools/cmdline.c
   branches/SAMBA_4_0/source/lib/ldb/tools/ldbadd.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/tools/cmdline.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/tools/cmdline.c	2007-05-05 18:50:56 UTC (rev 22681)
+++ branches/SAMBA_4_0/source/lib/ldb/tools/cmdline.c	2007-05-05 18:59:52 UTC (rev 22682)
@@ -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"

Modified: branches/SAMBA_4_0/source/lib/ldb/tools/ldbadd.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/tools/ldbadd.c	2007-05-05 18:50:56 UTC (rev 22681)
+++ branches/SAMBA_4_0/source/lib/ldb/tools/ldbadd.c	2007-05-05 18:59:52 UTC (rev 22682)
@@ -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;