Fix bad merge

diff --git a/contrib/slapd-modules/comp_match/Makefile b/contrib/slapd-modules/comp_match/Makefile
index 9327bef54d2f6ef97fa6b2447d49198709b43218..0302666ea34dbd01164dfcec3e939fa5680440c4 100644 (file)
--- a/contrib/slapd-modules/comp_match/Makefile
+++ b/contrib/slapd-modules/comp_match/Makefile
@@ -19,7 +19,7 @@ topbuilddir = ../../../../build
 topsrcdir = ../../..
 snaccdir = /usr/local/snacc
 
-LIBTOOL=$(topbuilddir)/libtool
+LIBTOOL=$(topsrcdir)/libtool
 OPT=-g -O2 -DLDAP_COMPONENT
 CC=gcc
 
@@ -30,7 +30,7 @@ INCS=$(LDAP_INC) $(SNACC_INC)
 
 SNACC_LIB=$(snaccdir)/c-lib/libcasn1.a
 SSL_LIB=-lcrypto
-LDAP_LIB=-lldap_r -llber
+#LDAP_LIB=-lldap_r -llber
 LIBS=$(LDAP_LIB) $(SNACC_LIB) $(SSL_LIB)
 
 all:   compmatch.la