Fix includes for VPATH builds

diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index 42d4024637ce6b4844bea89fa658c61d8a6fe3bb..9494b829c95e9b9a65142c9867df16996f657208 100644 (file)
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -35,7 +35,7 @@ OBJS  = main.o daemon.o connection.o search.o filter.o add.o cr.o \
                limits.o backglue.o operational.o matchedValues.o cancel.o \
                $(@PLAT@_OBJS)
 
-LDAP_INCDIR= ../../include -Islapi
+LDAP_INCDIR= ../../include -I$(srcdir)/slapi
 LDAP_LIBDIR= ../../libraries
 
 SLAP_DIR=

diff --git a/servers/slapd/slapi/Makefile.in b/servers/slapd/slapi/Makefile.in
index efe196071a5c23e1ab253e0a9a8c78d829a11fd9..ade485e952de7cb6d3d4b3e2d4012e83535c3265 100644 (file)
--- a/servers/slapd/slapi/Makefile.in
+++ b/servers/slapd/slapi/Makefile.in
@@ -33,6 +33,7 @@ XLIBS = $(LIBRARY)
 XXLIBS = 
 NT_LINK_LIBS = $(AC_LIBS)
 
+XINCPATH = -I.. -I$(srcdir)/..
 XDEFS = $(MODULES_CPPFLAGS)
 
 UNIX_LINK_LIBS = ./libtmpslapd.a ../libbackends.a ../../../libraries/libavl/libavl.a ../../../libraries/liblber/.libs/liblber.a ../../../libraries/libldbm/libldbm.a ../../../libraries/libldif/libldif.a ../../../libraries/liblutil/liblutil.a ../../../libraries/liblunicode/liblunicode.a ../../../libraries/libldap_r/.libs/libldap_r.a ./libtmpslapd.a