Converted ch_malloc and ch_calloc calls to SLAP_MALLOC and SLAP_CALLOC.

[openldap] / build / top.mk

diff --git a/build/top.mk b/build/top.mk
index 280befc846b6873cc05aca45509a06e7a481a385..e242958242439e68684e2b72a660a97788ea683e 100644 (file)
--- a/build/top.mk
+++ b/build/top.mk
@@ -10,6 +10,7 @@
 ##
 PACKAGE= @PACKAGE@
 VERSION= @VERSION@
+RELEASEDATE= @OPENLDAP_RELEASE_DATE@
 
 @SET_MAKE@
 SHELL = /bin/sh
@@ -43,8 +44,6 @@ OBJEXT = @OBJEXT@
 
 BUILD_LIBS_DYNAMIC = @BUILD_LIBS_DYNAMIC@
 
-SHTOOL = $(top_builddir)/@SHTOOL@
-
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
@@ -60,6 +59,8 @@ MKDEP_CFLAGS = @OL_MKDEP_FLAGS@
 
 MKVERSION = $(top_srcdir)/build/mkversion -v "$(VERSION)"
 
+SHTOOL = $(top_srcdir)/build/shtool
+
 LIBTOOL = @LIBTOOL@
 LIBVERSION = @OPENLDAP_LIBVERSION@
 LTVERSION = -version-info $(LIBVERSION)
@@ -110,14 +111,13 @@ LTFINISH = $(LIBTOOL) --mode=finish
 
 # Misc UNIX commands used in build environment
 AR = @AR@
-AWK = @AWK@
 BASENAME = basename
 CAT = cat
 CHMOD = chmod
 DATE = date
 HOSTNAME = $(SHTOOL) echo -e "%h%d"
-LN = $(SHTOOL) mkln
-LN_H = $(SHTOOL) mkln -f
+LN = ln
+LN_H = @LN_H@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 MKDIR = $(SHTOOL) mkdir -p
@@ -127,11 +127,6 @@ RANLIB = @RANLIB@
 RM = rm -f
 SED = sed
 
-# Misc UNIX commands used in programs
-EDITOR = @EDITOR@
-FINGER = @FINGER@
-SENDMAIL = @SENDMAIL@
-
 # For manual pages
 # MANCOMPRESS=@MANCOMPRESS@
 # MANCOMPRESSSUFFIX=@MANCOMPRESSSUFFIX@
@@ -235,6 +230,9 @@ veryclean: FORCE
 
 Makefile: Makefile.in $(top_srcdir)/build/top.mk
 
+pathtest:
+       $(SHTOOL) --version
+
 # empty rule for forcing rules
 FORCE: