More sh portability changes

diff --git a/build/man.mk b/build/man.mk
index 5ba9da38ec9147dc0b5b8b26ad0da54f3d832892..900267984f5081e9a6d9db3db3ed932dc3b7007f 100644 (file)
--- a/build/man.mk
+++ b/build/man.mk
@@ -33,7 +33,7 @@ install-common:
                echo "installing $(MANDIR)/$$page"; \
                $(RM) $(MANDIR)/$$page; \
                $(INSTALL) $(INSTALLFLAGS) -m 644 $$page.$(TMP_SUFFIX) $(MANDIR)/$$page; \
-               if [ -f "$(srcdir)/$$page.links" ]; then \
+               if test -f "$(srcdir)/$$page.links" ; then \
                        for link in `$(CAT) $(srcdir)/$$page.links`; do \
                                echo "installing $(MANDIR)/$$link as link to $$page"; \
                                $(LN_S) -f $$page $(MANDIR)/$$link; \

diff --git a/build/mkdep b/build/mkdep
index e855d2bfddf949431f532e481b5c93eb4807bd9a..420657ccceb9b2f134fedf6079b78c052163d0c5 100755 (executable)
--- a/build/mkdep
+++ b/build/mkdep
@@ -29,11 +29,13 @@ set -e                              # exit immediately if any errors occur
 
 MAKE=Makefile                  # default makefile name is "Makefile"
 NOSLASH="no"                   # by default, / dependencies are included
-CC=${CC_MKDEP-${CC-cc}}                # default compiler is cc
-: ${CC_MKDEP_FLAGS="-M"}       # cc -M usually produces dependencies
 SRCDIR=""
 SED=cat
 
+: ${CC=cc}
+: ${CC_MKDEP=$CC}
+: ${CC_MKDEP_FLAGS="-M"}       # cc -M usually produces dependencies
+
 while :
        do case "$1" in
                # the -s flag removes dependencies to files that begin with /
@@ -53,7 +55,7 @@ while :
 
                # -c allows you to select a compiler to use (default is cc)
                -c)
-                       [ -z "$CC_MKDEP" ] && CC=$2
+                       test -z "$CC_MKDEP" && CC_MKDEP=$2
                        shift; shift ;;
 
                # the -p flag produces "program: program.c" style dependencies
@@ -75,12 +77,12 @@ while :
        esac
 done
 
-if [ $# = 0 ] ; then
+if test $# = 0 ; then
        echo 'usage: mkdep [-p] [-s] [-c cc] [-f makefile] [-d srcdir] [flags] file ...'
        exit 1
 fi
 
-if [ ! -w $MAKE ]; then
+if test ! -w $MAKE ; then
        echo "mkdep: no writeable file \"$MAKE\""
        exit 1
 fi
@@ -132,7 +134,7 @@ cat << _EOF_ >> $TMP
 
 _EOF_
 
-$CC $CC_MKDEP_FLAGS $files | \
+$CC_MKDEP $CC_MKDEP_FLAGS $files | \
        sed -e 's; \./; ;g' | \
        $SED > $TMP.sed
 # dont pipe to awk.  SGI awk wants a filename as argument.

diff --git a/build/srv.mk b/build/srv.mk
index 4e5f819a64f46cfa9edb7266d64464631c19d494..9ee77f9a5b1952a24be8031a98ddcd3b52c710d3 100644 (file)
--- a/build/srv.mk
+++ b/build/srv.mk
@@ -7,7 +7,7 @@
 ##
 
 all-common: FORCE
-       @if [ "$(BUILD_SRV)" = "yes" ]; then \
+       @if test "$(BUILD_SRV)" = "yes" ; then \
                $(MAKE) $(MFLAGS) all-srv; \
        else \
                echo "run configure with $(BUILD_OPT) to build $(PROGRAMS)"; \
@@ -17,28 +17,28 @@ clean-common: clean-srv FORCE
 veryclean-common: veryclean-srv FORCE
 
 lint-common: FORCE
-       @if [ "$(BUILD_SRV)" = "yes" ]; then \
+       @if test "$(BUILD_SRV)" = "yes" ; then \
                $(MAKE) $(MFLAGS) lint-srv; \
        else \
                echo "run configure with $(BUILD_OPT) to lint $(PROGRAMS)"; \
        fi
 
 5lint-common: FORCE
-       @if [ "$(BUILD_SRV)" = "yes" ]; then \
+       @if test "$(BUILD_SRV)" = "yes" ; then \
                $(MAKE) $(MFLAGS) 5lint-srv; \
        else \
                echo "run configure with $(BUILD_OPT) to 5lint $(PROGRAMS)"; \
        fi
 
 depend-common: FORCE
-       @if [ "$(BUILD_SRV)" = "yes" ]; then \
+       @if test "$(BUILD_SRV)" = "yes" ; then \
                $(MAKE) $(MFLAGS) depend-srv; \
        else \
                echo "run configure with $(BUILD_OPT) to depend $(PROGRAMS)"; \
        fi
 
 install-common: FORCE
-       @if [ "$(BUILD_SRV)" = "yes" ]; then \
+       @if test "$(BUILD_SRV)" = "yes" ; then \
                $(MAKE) $(MFLAGS) install-srv; \
        else \
                echo "run configure with $(BUILD_OPT) to install $(PROGRAMS)"; \