Set SHTOOL directly. Add 'make pathtest'.

[openldap] / build / mkdep

diff --git a/build/mkdep b/build/mkdep
index 9c35e59dadf977b0480af11c3b61baba993cbc86..b9df7060f3981173cb97666cb403827b013ea4fb 100755 (executable)
--- a/build/mkdep
+++ b/build/mkdep
@@ -1,5 +1,6 @@
 #! /bin/sh -
-## Copyright 1998,1999 The OpenLDAP Foundation
+# $OpenLDAP$
+## Copyright 1998-2002 The OpenLDAP Foundation
 ## COPYING RESTRICTIONS APPLY.  See COPYRIGHT File in top level directory
 ## of this package for details.
 #
@@ -143,7 +144,7 @@ cat << _EOF_ >> $TMP
 _EOF_
 
 $MKDEP_CC $MKDEP_CFLAGS $files | \
-       sed -e 's; \./; ;g' | \
+       sed -e 's; \./; ;g' -e 's/ :/:/' | \
        $SED > $TMP.sed
 # do not pipe to awk.  SGI awk wants a filename as argument.
 # (or '-', but I do not know if all other awks support that.)
@@ -156,17 +157,18 @@ $1 !~ /:$/ {
        dep=$0
 }
 /.*/ {
+       if ( length(filenm) < 2 ) next
        if ( filenm ~ /:.*:$/ ) next
        split(dep, depends, " ")
        for(d in depends) {
                dfile = depends[d]
+               if ( length(dfile) < 2 ) continue
                if ( dfile ~ /:/ ) continue
                if (( noslash == "yes") && (dfile ~ /^\// )) continue
-               if ( length(dfile) < 2 ) continue
                rec = filenm " " dfile
                print rec
        }
-    }
+}
 ' noslash="$NOSLASH" $TMP.sed >> $TMP