Added lber_get/set_option. Removed lber_debug/ldap_debug.

[openldap] / build / top.mk

diff --git a/build/top.mk b/build/top.mk
index 0fdbf962dc8e5a46278dacdee0805c6ae7d53d11..03cd3d6b275403f66829ff5182ee70e1ecaa5894 100644 (file)
--- a/build/top.mk
+++ b/build/top.mk
@@ -17,17 +17,18 @@ VPATH = @srcdir@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 
+ldap_subdir = @ldap_subdir@
 bindir = @bindir@
-sbindir = @sbindir@
+datadir = @datadir@/$(ldap_subdir)
+includedir = @includedir@
+infodir = @infodir@
+libdir = @libdir@
 libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@/ldap
-sharedstatedir = @sharedstatedir@
 localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
 mandir = @mandir@
-includedir = @includedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@/$(ldap_subdir)
 
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -48,7 +49,7 @@ MKDEP = $(top_srcdir)/build/mkdep $(MKDEPFLAG) -c "$(CC)"
 
 LIBTOOL = @LIBTOOL@
 LIBVERSION = 0:0:0
-LTLINK  = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LFLAGS)
+LTLINK  = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LFLAGS) $(LTVERSION)
 LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) 
 
 # Misc UNIX commands used in makefiles
@@ -58,7 +59,7 @@ HOSTNAME = uname -n
 BASENAME = basename
 PWD = pwd
 CAT = cat
-MKDIR = mkdir
+MKDIR = mkdir -p
 CHMOD = chmod
 
 # Misc UNIX commands used in programs
@@ -133,6 +134,7 @@ lint5-local:
 
 veryclean: FORCE
        $(RM) Makefile
+       $(RM) -r .libs
 
 Makefile: Makefile.in $(top_srcdir)/build/top.mk