Set SHTOOL directly. Add 'make pathtest'.

[openldap] / build / mkdep

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