Modifiction to the nssov so that it can be build within the debian build tree. Index: ubuntu/contrib/slapd-modules/nssov/Makefile =================================================================== --- ubuntu.orig/contrib/slapd-modules/nssov/Makefile 2009-09-07 17:26:13.000000000 -0400 +++ ubuntu/contrib/slapd-modules/nssov/Makefile 2009-09-07 17:27:14.000000000 -0400 @@ -17,7 +17,7 @@ # Path to the OpenLDAP object tree - same as above unless # you're doing out-of-tree builds. -LDAPOBJ=../../.. +LDAPOBJ=../../../debian/build LIBTOOL=$(LDAPOBJ)/libtool OPT=-g -O2 @@ -27,17 +27,17 @@ NLDAPD_INC=-Inss-ldapd INCS=$(LDAP_INC) $(NLDAPD_INC) -LDAP_LIB=-lldap_r -llber +LDAP_LIB=-L$(LDAPOBJ)/libraries/libldap_r -lldap_r -L$(LDAPOBJ)/libraries/liblber -llber LIBS=$(LDAP_LIB) -prefix=/usr/local +prefix=/usr exec_prefix=$(prefix) -ldap_subdir=/openldap +ldap_subdir=/ldap libdir=$(exec_prefix)/lib -libexecdir=$(exec_prefix)/libexec +libexecdir=$(exec_prefix)/lib moduledir = $(libexecdir)$(ldap_subdir) -sysconfdir = $(prefix)/etc$(ldap_subdir) +sysconfdir = /etc$(ldap_subdir) schemadir = $(sysconfdir)/schema all: install @@ -53,13 +53,13 @@ $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $< tio.lo: nss-ldapd/common/tio.c - $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(NLDAPD_INC) -c $? + $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $? -$(OBJS): nssov.h +#$(OBJS): nssov.h nssov.la: $(OBJS) $(XOBJS) $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info 0:0:0 \ - -rpath $(libdir) -module -o $@ $(OBJS) $(XOBJS) $(LIBS) + -rpath $(moduledir) -module -o $@ $(OBJS) $(XOBJS) $(LIBS) install: nssov.la mkdir -p $(DESTDIR)$(moduledir) Index: ubuntu/contrib/slapd-modules/nssov/nss-ldapd/common/tio.c =================================================================== --- ubuntu.orig/contrib/slapd-modules/nssov/nss-ldapd/common/tio.c 2009-09-07 15:58:44.000000000 -0400 +++ ubuntu/contrib/slapd-modules/nssov/nss-ldapd/common/tio.c 2009-09-07 17:26:47.000000000 -0400 @@ -20,7 +20,7 @@ 02110-1301 USA */ -#include "config.h" +#include "portable.h" #ifdef HAVE_STDINT_H #include