perl 5.002beta2 patch: doop.c

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

diff --git a/makedepend.SH b/makedepend.SH
index 296c954..3fa095c 100755 (executable)
--- a/makedepend.SH
+++ b/makedepend.SH
@@ -18,9 +18,14 @@ case "$0" in
 esac
 echo "Extracting makedepend (with variable substitutions)"
 rm -f makedepend
-$spitshell >makedepend <<'!NO!SUBS!'
+$spitshell >makedepend <<!GROK!THIS!
+$startsh
 # makedepend.SH
 #
+## To use an alternate make, set \$altmake in config.sh.
+MAKE=${altmake-make}
+!GROK!THIS!
+$spitshell >>makedepend <<'!NO!SUBS!'
 
 export PATH || (echo "OOPS, this isn't sh.  Desperation time.  I will feed myself to sh."; sh \$0; kill \$\$)
 
@@ -38,7 +43,11 @@ case $CONFIG in
        ;;
 esac
 
-PATH="$PATH:."
+# We need .. when we are in the x2p directory if we are using the
+# cppstdin wrapper script.
+# Put .. and . first so that we pick up the present cppstdin, not
+# an older one lying about in /usr/local/bin.
+PATH=".:..:$PATH"
 export PATH
 
 $cat /dev/null >.deptmp
@@ -70,7 +79,7 @@ esac
 : might be identical
 $test -d UU || mkdir UU
 
-make clist || ($echo "Searching for .c files..."; \
+$MAKE clist || ($echo "Searching for .c files..."; \
        $echo *.c | $tr ' ' '\012' | $egrep -v '\*' >.clist)
 for file in `$cat .clist`; do
 # for file in `cat /dev/null`; do
@@ -94,6 +103,7 @@ for file in `$cat .clist`; do
        -e '}' ) >UU/$file.c
     $cppstdin $finc -I/usr/local/include -I. $cppflags $cppminus <UU/$file.c |
     $sed \
+       -e '/^#.*<stdin>/d' \
        -e 's#\.[0-9][0-9]*\.c#'"$file.c#" \
        -e 's/^[         ]*#[    ]*line/#/' \
        -e '/^# *[0-9][0-9]* *[".\/]/!d' \
@@ -106,7 +116,7 @@ done
 
 $sed <$mf >$mf.new -e '1,/^# AUTOMATICALLY/!d'
 
-make shlist || ($echo "Searching for .SH files..."; \
+$MAKE shlist || ($echo "Searching for .SH files..."; \
        $echo *.SH | $tr ' ' '\012' | $egrep -v '\*' >.shlist)
 if $test -s .deptmp; then
     for file in `cat .shlist`; do
@@ -119,7 +129,7 @@ if $test -s .deptmp; then
     $sed 's|^\(.*\.o:\) *\(.*/.*\.c\) *$|\1 \2; '"$defrule \2|" .deptmp \
        >>$mf.new
 else
-    make hlist || ($echo "Searching for .h files..."; \
+    $MAKE hlist || ($echo "Searching for .h files..."; \
        $echo *.h | $tr ' ' '\012' | $egrep -v '\*' >.hlist)
     $echo "You don't seem to have a proper C preprocessor.  Using grep instead."
     $egrep '^#include ' `cat .clist` `cat .hlist`  >.deptmp