Align with back-ldbm version

[openldap] / build / top.mk

diff --git a/build/top.mk b/build/top.mk
index 935728b547b6b05982ccfabc3c7903437d77574b..e1c1d71305f0a06d158986694b755e30b4627613 100644 (file)
--- a/build/top.mk
+++ b/build/top.mk
@@ -43,8 +43,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 +58,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)
@@ -116,9 +116,9 @@ CAT = cat
 CHMOD = chmod
 DATE = date
 HOSTNAME = $(SHTOOL) echo -e "%h%d"
-LN = $(SHTOOL) mkln
-LN_H = $(SHTOOL) mkln -f
-LN_S = $(SHTOOL) mkln -f -s
+LN = ln
+LN_H = @LN_H@
+LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 MKDIR = $(SHTOOL) mkdir -p
 MV = mv
@@ -235,6 +235,9 @@ veryclean: FORCE
 
 Makefile: Makefile.in $(top_srcdir)/build/top.mk
 
+pathtest:
+       $(SHTOOL) --version
+
 # empty rule for forcing rules
 FORCE: