Store the BM table in mg_ptr instead of after SvCUR().

[perl5.git] / Makefile.SH

diff --git a/Makefile.SH b/Makefile.SH
index 2567f8b..8c17ac2 100755 (executable)
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -166,9 +166,11 @@ esac
 
 : is Cwd static or dynamic
 static_cwd='define'
+list_util_dep='$(PERL_EXE)'
 for f in $dynamic_ext; do
    case $f in
        Cwd) static_cwd='undef' ;;
+       List/Util) list_util_dep=lib/auto/List/Util/Util.$dlext
    esac
 done
 
@@ -185,11 +187,9 @@ for f in $dynamic_ext; do
     : Parallel makes reveal that we have some interdependencies
     case $f in
        Math/BigInt/FastCalc|Devel/NYTProf) extra_dep="$extra_dep
-$this_target: lib/auto/List/Util/Util.$dlext" ;;
+$this_target: $list_util_dep" ;;
        Unicode/Normalize) extra_dep="$extra_dep
 $this_target: uni.data" ;;
-       Text/ParseWords) extra_dep="$extra_dep
-$this_target: lib/auto/Scalar/Util.$dlext" ;;
     esac
 done
 
@@ -580,6 +580,9 @@ translators:        $x2p_deps
 x2p/s2p: $x2p_deps
        cd x2p; \$(LDLIBPTH) \$(MAKE) s2p
 
+x2p/find2perl: $x2p_deps
+       cd x2p; \$(LDLIBPTH) \$(MAKE) find2perl
+
 utilities:     $util_deps
        @echo " "; echo "       Making utilities"; cd utils; \$(LDLIBPTH) \$(MAKE) all
 
@@ -1379,7 +1382,9 @@ _test:
 
 test_prep_pre: preplibrary utilities $(nonxs_ext)
 
-test_prep: test_prep_pre $(MINIPERL_EXE) $(unidatafiles) $(PERL_EXE) $(dynamic_ext) $(TEST_PERL_DLL) runtests x2p/s2p $(generated_pods)
+test_prep: test_prep_pre $(MINIPERL_EXE) $(unidatafiles) $(PERL_EXE) \
+       $(dynamic_ext) $(TEST_PERL_DLL) runtests x2p/s2p x2p/find2perl \
+       $(generated_pods)
        cd t && (rm -f $(PERL_EXE); $(LNS) ../$(PERL_EXE) $(PERL_EXE))
 
 test_prep_reonly: $(MINIPERL_EXE) $(PERL_EXE) $(dynamic_ext_re) $(TEST_PERL_DLL)