Fix single-value delete, replace

[openldap] / contrib / ldaptcl / Makefile.in

diff --git a/contrib/ldaptcl/Makefile.in b/contrib/ldaptcl/Makefile.in
index a7db9517eb23fadd39b6f1b1aa2e8294b339db60..04586ff58ee95a52452a71b54e71470bf136a749 100644 (file)
--- a/contrib/ldaptcl/Makefile.in
+++ b/contrib/ldaptcl/Makefile.in
@@ -21,24 +21,24 @@ exec_prefix =       @exec_prefix@
 # The following definition can be set to non-null for special systems
 # like AFS with replication.  It allows the pathnames used for installation
 # to be different than those used for actually reference files at
-# run-time.  INSTALL_ROOT is prepended to $prefix and $exec_prefix
+# run-time.  DESTDIR is prepended to $prefix and $exec_prefix
 # when installing files.
-INSTALL_ROOT =
+DESTDIR =
 
 # Directory in which to search for tcl libraries
 NEO_LIBRARY    = $(exec_prefix)/lib/ldaptcl$(VERSION)
 
 # Directory in which to install the ldaptcl binary:
-BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin
+BIN_INSTALL_DIR = $(DESTDIR)$(exec_prefix)/bin
 
 # Directory in which to install the .a or .so binary for the Neo library:
-LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib
+LIB_INSTALL_DIR = $(DESTDIR)$(exec_prefix)/lib
 
 # Path to use at runtime to refer to LIB_INSTALL_DIR:
 LIB_RUNTIME_DIR =      $(exec_prefix)/lib
 
 # Top-level directory for man entries:
-MANN_INSTALL_DIR =     $(INSTALL_ROOT)$(prefix)/man/mann
+MANN_INSTALL_DIR =     $(DESTDIR)$(prefix)/man/mann
 
 
 # The symbols below provide support for dynamic loading and shared
@@ -85,6 +85,7 @@ SHLIB_LD = @SHLIB_LD@
 
 LDAP_LIBFLAGS  = @ldaplibflags@
 LDAP_CFLAGS    = @ldapinclude@
+LDAP_INCDIR    = @ldapincdir@
 LDAP_BUILD     = @ldapbuild@
 LDAP_DIR       = @ldapdir@
 
@@ -120,13 +121,11 @@ LIBS= @LIBS@ @TCLX_LIB_SPEC@ @TCL_LIB_SPEC@ @TCL_LIBS@ $(LDAP_LIBFLAGS) -lc
 TK_LIBS=@TKX_LIB_SPEC@ @TK_LIB_SPEC@ @TK_LIBS@
 TK_VERSION=@TK_VERSION@
 
-LDAPINCDIR=/usr/local/include
-
 CC =        @CC@
 CC_SWITCHES =   ${CFLAGS} @NEO_SHLIB_CFLAGS@ -I. \
 -I@prefix@/include ${AC_FLAGS} ${PROTO_FLAGS} \
 ${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} ${KEYSYM_FLAGS} \
--DNEO_LIBRARY=\"${NEO_LIBRARY}\"
+-DNEO_LIBRARY=\"${NEO_LIBRARY}\" -DVERSION=\"${VERSION}\" 
 
 TK_SWITCHES = ${CC_SWITCHES} @TK_XINCLUDES@
 
@@ -140,15 +139,20 @@ all:      @NEO_LIB_FILE@ ldaptclsh @LDAPWISH@
        @MAKE_LIB@
        $(RANLIB) @NEO_LIB_FILE@
 
-neoXldap.o: neoXldap.c
+neoXldap.o: neoXldap.c ldaptclerr.h
        $(CC) -c $(LDAP_CFLAGS) $(CC_SWITCHES) $<
 
+ldaptclerr.h: ldaperr.tcl
+       tcl ldaperr.tcl $(LDAP_INCDIR)/ldap.h > ldaptclerr.h
+       
+
 clean:
        -rm -f ldaptclsh ldapwish
        -rm -f *.o *.a *.so*
 
 distclean: clean
-       rm -f Makefile pkgIndex.tcl config.cache config.log config.status
+       rm -f Makefile pkgIndex.tcl config.cache config.log config.status \
+               ldaptclerr.h
 
 install: install-binaries install-man