more TIEHANDLE

[p5sagit/p5-mst-13.2.git] / makedepend.SH

diff --git a/makedepend.SH b/makedepend.SH
index 93ab261..336d24c 100755 (executable)
--- a/makedepend.SH
+++ b/makedepend.SH
@@ -18,16 +18,13 @@ case "$0" in
 */*) cd `expr X$0 : 'X\(.*\)/'` ;;
 esac
 
-: ${bin_sh=/bin/sh}
-
 echo "Extracting makedepend (with variable substitutions)"
 rm -f makedepend
 $spitshell >makedepend <<!GROK!THIS!
 $startsh
 # makedepend.SH
 #
-## To use an alternate make, set \$altmake in config.sh.
-MAKE=${altmake-make}
+MAKE=$make
 !GROK!THIS!
 $spitshell >>makedepend <<'!NO!SUBS!'
 
@@ -63,12 +60,12 @@ fi
 mf=$firstmakefile
 if test -f $mf; then
     defrule=`<$mf sed -n               \
-       -e '/^\.c\(\$(OBJ_EXT)\|\.o\):.*;/{'    \
+       -e '/^\.c\$(OBJ_EXT):.*;/{'     \
        -e    's/\$\*\.c//'             \
        -e    's/^[^;]*;[        ]*//p' \
        -e    q                         \
        -e '}'                          \
-       -e '/^\.c\(\$(OBJ_EXT)\|\.o\): *$/{'    \
+       -e '/^\.c\$(OBJ_EXT): *$/{'     \
        -e    N                         \
        -e    's/\$\*\.c//'             \
        -e    's/^.*\n[  ]*//p'         \
@@ -135,12 +132,12 @@ rm .shlist.old
 if $test -s .deptmp; then
     for file in `cat .shlist`; do
        $echo `$expr X$file : 'X\(.*\).SH'`: $file $TOP/config.sh \; \
-           $bin_sh $file >> .deptmp
+           $sh $file >> .deptmp
     done
     $echo "Updating $mf..."
     $echo "# If this runs make out of memory, delete /usr/include lines." \
        >> $mf.new
-    $sed 's|^\(.*\(\$(OBJ_EXT)\|\.o\):\) *\(.*/.*\.c\) *$|\1 \3; '"$defrule \2|" .deptmp \
+    $sed 's|^\(.*\$(OBJ_EXT):\) *\(.*/.*\.c\) *$|\1 \2; '"$defrule \2|" .deptmp \
        >>$mf.new
 else
     $MAKE hlist || ($echo "Searching for .h files..."; \
@@ -162,7 +159,7 @@ else
        $sed -f .hsed >> $mf.new
     for file in `$cat .shlist`; do
        $echo `$expr X$file : 'X\(.*\).SH'`: $file $TOP/config.sh \; \
-           $bin_sh $file >> $mf.new
+           $sh $file >> $mf.new
     done
 fi
 $rm -f $mf.old