diff options
| author | Gerald Carter <jerry@samba.org> | 2006-09-25 14:07:33 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:14:43 -0500 |
| commit | 2cb15a95161abec710523f5076299bfa1c2bb1c2 (patch) | |
| tree | 9020b99e64d61a8ac103d4c07f54e4e4c2e4ebea /source3 | |
| parent | 75064ae95eb385e65d290f6f680ed729c6e2135b (diff) | |
| download | samba-2cb15a95161abec710523f5076299bfa1c2bb1c2.tar.gz samba-2cb15a95161abec710523f5076299bfa1c2bb1c2.tar.bz2 samba-2cb15a95161abec710523f5076299bfa1c2bb1c2.zip | |
r18896: * Fix out of tree builds after libreplace merge
* Remove unused -D define in Makefile
(This used to be commit 3c9632bedca5ff3816f5f7b8b5f47b29c4e7fa02)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/Makefile.in | 2 | ||||
| -rw-r--r-- | source3/configure.in | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 67e5b5ab20..0b5dd106e2 100644 --- a/source3/Makefile.in +++ b/source3/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/source3/configure.in b/source3/configure.in index 61a4e2e524..bcdaa56195 100644 --- a/source3/configure.in +++ b/source3/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 |