shtool updates

diff --git a/build/mkversion b/build/mkversion
index b8133ee19f4656137e9c7786fb0fbddf299d36fc..4b64f0e6b10da1f0c5232c5f8e6198faceb85940 100755 (executable)
--- a/build/mkversion
+++ b/build/mkversion
@@ -48,9 +48,12 @@ WHOWHERE="$USER@`uname -n`:`pwd`"
 cat << __EOF__
 /*
  * Copyright 1998-2002 The OpenLDAP Foundation
- * COPYING RESTRICTIONS APPLY.  See COPYRIGHT File in top level directory
+ * COPYING RESTRICTIONS APPLY.  See COPYRIGHT file in top level directory
  * of this package for details.
  */
+static const char copyright[] =
+"Copyright 1998-2002 The OpenLDAP Foundation\n"
+"COPYING RESTRICTIONS APPLY\n";
 
 $static $const char $SYMBOL[] =
 "@(#) \$$PACKAGE: $APPLICATION $VERSION ($WHEN) \$\n\t$WHOWHERE\n";

diff --git a/build/top.mk b/build/top.mk
index dac1ce3cb63e44ab3445ccb7d9c158e0472be2cb..4cec1aed3001cef7a0698651200edfdb5c5ed54b 100644 (file)
--- a/build/top.mk
+++ b/build/top.mk
@@ -43,6 +43,8 @@ OBJEXT = @OBJEXT@
 
 BUILD_LIBS_DYNAMIC = @BUILD_LIBS_DYNAMIC@
 
+SHTOOL = $(top_builddir)/@SHTOOL@
+
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
@@ -112,12 +114,12 @@ BASENAME = basename
 CAT = cat
 CHMOD = chmod
 DATE = date
-HOSTNAME = uname -n
-LN = ln
-LN_H = @LN_H@
-LN_S = @LN_S@
+HOSTNAME = $(SHTOOL) echo -e "%h%d"
+LN = $(SHTOOL) mkln
+LN_H = $(SHTOOL) mkln -f
+LN_S = $(SHTOOL) mkln -f -s
 MAKEINFO = @MAKEINFO@
-MKDIR = mkdir -p
+MKDIR = $(SHTOOL) mkdir -p
 MV = mv
 PWD = pwd
 RANLIB = @RANLIB@