Use shtool(1) (to a limited degree, more use would simplify things)

Fix ITS#3285 (relative linking of slap tools).

build/top.mk

@@ -49,10 +49,12 @@ OBJEXT = @OBJEXT@
 
 BUILD_LIBS_DYNAMIC = @BUILD_LIBS_DYNAMIC@
 
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+SHTOOL = $(top_srcdir)/build/shtool
+
+INSTALL = $(SHTOOL) install -c
+INSTALL_PROGRAM = $(INSTALL)
+INSTALL_DATA = $(INSTALL) -m 644
+INSTALL_SCRIPT = $(INSTALL)
 
 LINT = lint
 5LINT = 5lint
@@ -64,8 +66,6 @@ MKDEP_CFLAGS = @OL_MKDEP_FLAGS@
 
 MKVERSION = $(top_srcdir)/build/mkversion -v "$(VERSION)"
 
-SHTOOL = $(top_srcdir)/build/shtool
-
 LIBTOOL = @LIBTOOL@
 LIBRELEASE = @OPENLDAP_LIBRELEASE@
 LIBVERSION = @OPENLDAP_LIBVERSION@
@@ -125,13 +125,14 @@ BASENAME = basename
 CAT = cat
 CHMOD = chmod
 DATE = date
+ECHO = $(SHTOOL) echo
 HOSTNAME = $(SHTOOL) echo -e "%h%d"
-LN = ln
-LN_H = @LN_H@
-LN_S = @LN_S@
+LN = $(SHTOOL) mkln
+LN_H = $(LN)
+LN_S = $(LN) -s
 MAKEINFO = @MAKEINFO@
 MKDIR = $(SHTOOL) mkdir -p
-MV = mv
+MV = $(SHTOOL) move
 PWD = pwd
 RANLIB = @RANLIB@
 RM = rm -f

configure.in

@@ -557,8 +557,6 @@ SLAPD_SLP_LIBS=
 dnl ================================================================
 dnl Checks for programs
 
-AC_PROG_INSTALL
-
 AC_DEFINE(HAVE_MKVERSION, 1, [define this if you have mkversion])
 
 dnl ----------------------------------------------------------------
@@ -627,9 +625,6 @@ AC_LIBTOOL_WIN32_DLL
 AC_LIBTOOL_DLOPEN
 AC_PROG_LIBTOOL
 
-OL_PROG_LN_H
-AC_PROG_LN_S
-
 dnl ----------------------------------------------------------------
 dnl Perl
 ol_link_perl=no

servers/slapd/Makefile.in

@@ -257,7 +257,7 @@ libslapi.a: slapi/.libs/libslapi.a
 slapd: $(SLAPD_DEPENDS) @LIBSLAPI@
 	$(LTLINK) -o $@ $(SLAPD_OBJECTS) $(LIBS) \
 		$(WRAP_LIBS)
-	rm -f $(SLAPTOOLS)
+	$(RM) $(SLAPTOOLS)
 	for i in $(SLAPTOOLS); do \
 		$(LN_S) slapd$(EXEEXT) $$i$(EXEEXT); done
 
@@ -330,7 +330,7 @@ depend-local-srv: FORCE
 	@echo ""
 
 clean-local:
-	rm -f *.exp *.def *.base *.a *.objs symdummy.c
+	$(RM) *.exp *.def *.base *.a *.objs symdummy.c
 
 clean-local-srv: FORCE
 	@for i in $(SUBDIRS); do \
@@ -340,7 +340,7 @@ clean-local-srv: FORCE
 			if test $$? != 0 ; then exit 1; fi ; \
 		fi; \
 	done
-	rm -f *.tmp all-cffiles
+	$(RM) *.tmp all-cffiles
 
 veryclean-local-srv: FORCE
 	@for i in $(SUBDIRS); do \
@@ -426,9 +426,8 @@ install-db-config: FORCE
 
 install-tools: FORCE
 	-$(MKDIR) $(DESTDIR)$(sbindir)
-	cd $(DESTDIR)$(sbindir); \
-	rm -f $(SLAPTOOLS); \
 	for i in $(SLAPTOOLS); do \
-		$(LN_S) $(libexecdir)/slapd$(EXEEXT) $$i$(EXEEXT); \
+		$(RM) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \
+		$(LN_S) -f $(DESTDIR)$(libexecdir)/slapd$(EXEEXT) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \
 	done