Set SHTOOL directly. Add 'make pathtest'.

diff --git a/build/top.mk b/build/top.mk
index d4412c1e5ddd08fb4bf15fac597ce791e4473755..dfb2510ab6e23e643e71f8aca60ac9b06ae89db3 100644 (file)
--- a/build/top.mk
+++ b/build/top.mk
@@ -43,8 +43,6 @@ OBJEXT = @OBJEXT@
 
 BUILD_LIBS_DYNAMIC = @BUILD_LIBS_DYNAMIC@
 
-SHTOOL = @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)
@@ -235,6 +235,10 @@ veryclean: FORCE
 
 Makefile: Makefile.in $(top_srcdir)/build/top.mk
 
+pathtest:
+       @echo "shtool: $(SHTOOL)"
+       @$(SHTOOL) echo -e "  %Bokay%b"
+
 # empty rule for forcing rules
 FORCE: