random cleanup

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

diff --git a/makedepend.SH b/makedepend.SH
index 931dd82..81d49db 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!'
 
@@ -124,16 +121,18 @@ $sed <$mf >$mf.new -e '1,/^# AUTOMATICALLY/!d'
 $MAKE shlist || ($echo "Searching for .SH files..."; \
        $echo *.SH | $tr ' ' '\012' | $egrep -v '\*' >.shlist)
 
-# Now extract the dependency on makedepend.SH
-# (it should reside in the main Makefile):
+# Now extract the dependencies on makedepend.SH and Makefile.SH
+# (they should reside in the main Makefile):
 mv .shlist .shlist.old
 $egrep -v '^makedepend\.SH' <.shlist.old >.shlist
+mv .shlist .shlist.old
+$egrep -v '^Makefile\.SH' <.shlist.old >.shlist
 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." \
@@ -160,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