From: Gerald Carter <jerry@samba.org>
Date: Mon, 25 Sep 2006 14:07:33 +0000 (+0000)
Subject: r18896: * Fix out of tree builds after libreplace merge
X-Git-Tag: initial-v3-0-unstable~2019
X-Git-Url: http://git.samba.org/samba.git/?p=tprouty%2Fsamba.git;a=commitdiff_plain;h=3c9632bedca5ff3816f5f7b8b5f47b29c4e7fa02

r18896: * Fix out of tree builds after libreplace merge
* Remove unused -D define in Makefile
---

diff --git a/source/Makefile.in b/source/Makefile.in
index 67e5b5ab20..0b5dd106e2 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -132,7 +132,7 @@ FLAGS  = $(ISA) $(FLAGS5) -I$(srcdir)/lib -D_SAMBA_BUILD_=3
 
 PASSWD_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" -DPRIVATE_DIR=\"$(PRIVATE_DIR)\"
 PATH_FLAGS1 = -DCONFIGFILE=\"$(CONFIGFILE)\"  -DSBINDIR=\"$(SBINDIR)\"
-PATH_FLAGS2 = $(PATH_FLAGS1) -DBINDIR=\"$(BINDIR)\" -DDRIVERFILE=\"$(DRIVERFILE)\" 
+PATH_FLAGS2 = $(PATH_FLAGS1) -DBINDIR=\"$(BINDIR)\"
 PATH_FLAGS3 = $(PATH_FLAGS2) -DLMHOSTSFILE=\"$(LMHOSTSFILE)\" 
 PATH_FLAGS4 = $(PATH_FLAGS3) -DSWATDIR=\"$(SWATDIR)\"  -DLOCKDIR=\"$(LOCKDIR)\" -DPIDDIR=\"$(PIDDIR)\"
 PATH_FLAGS5 = $(PATH_FLAGS4) -DLIBDIR=\"$(LIBDIR)\" \
diff --git a/source/configure.in b/source/configure.in
index 61a4e2e524..bcdaa56195 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -229,12 +229,12 @@ do
 done
 ])
 
-SAMBA_CPPFLAGS="-Iinclude -I${srcdir-.}/include  -I. -I${srcdir-.}"
-SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/lib/replace"
-SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/lib/talloc"
-SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/tdb/include"
-SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/libaddns"
-SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/librpc"
+SAMBA_CPPFLAGS="-Iinclude -I\$(srcdir)/include  -I. -I\$(srcdir)"
+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I\$(srcdir)/lib/replace"
+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I\$(srcdir)/lib/talloc"
+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I\$(srcdir)/tdb/include"
+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I\$(srcdir)/libaddns"
+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I\$(srcdir)/librpc"
 
 SAMBA_CONFIGURE_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/popt"
 
@@ -876,7 +876,7 @@ esac
 
 AC_LIBREPLACE_BROKEN_CHECKS
 
-LIBREPLACE_DIR=`echo ${libreplacedir} |sed -e 's/^\.\///g'`
+LIBREPLACE_DIR=`echo ${libreplacedir} | sed -e "s;${srcdir};;" -e "s;^/;;"`
 
 LIBREPLACE_OBJS=""
 for obj in ${LIBREPLACEOBJ}; do