X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.SH;h=7c160d9e81492ff2b4acc6d2e0e8a45339fe537e;hb=3f7d42d86a70d697ec5a8fca00c89984282b399e;hp=5b4d46ff72a0b217e840816186732b3cd98030a9;hpb=6e36760b26269f003d86cd387e73137c4c53b491;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/Makefile.SH b/Makefile.SH
index 5b4d46f..7c160d9 100644
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -1,5 +1,5 @@
 #! /bin/sh
-case $CONFIGDOTSH in
+case $PERL_CONFIG_SH in
 '')
 	if test -f config.sh
 		then TOP=.
@@ -149,7 +149,8 @@ CLDFLAGS = $ldflags
 mallocsrc = $mallocsrc
 mallocobj = $mallocobj
 LNS = $lns
-CPS = $cp -f
+# NOTE: some systems don't grok "cp -f". XXX Configure test needed?
+CPS = $cp
 RMS = rm -f
 ranlib = $ranlib
 
@@ -563,7 +564,7 @@ sperl$(OBJ_EXT): perl.c $(h)
 # We have to call our ./makedir because Ultrix 4.3 make can't handle the line
 #	test -d lib/auto || mkdir lib/auto
 #
-preplibrary: miniperl lib/Config.pm
+preplibrary: miniperl lib/Config.pm lib/lib.pm lib/re.pm
 	@sh ./makedir lib/auto
 	@echo "	AutoSplitting perl library"
 	$(LDLIBPTH) ./miniperl -Ilib -e 'use AutoSplit; \
@@ -605,7 +606,7 @@ extra.pods: miniperl
 install-strip:
 	$(MAKE) STRIPFLAGS=-s install
 
-install:
+install install-all:
 	$(MAKE) install.perl install.man STRIPFLAGS=$(STRIPFLAGS)
 
 install-verbose:
@@ -826,7 +827,7 @@ _cleaner2:
 	rm -f h2ph.man pstruct
 	rm -rf .config
 	rm -f testcompile compilelog
-	-rmdir lib/B lib/Data lib/Digest lib/Encode lib/MIME lib/IO/Socket lib/IO lib/Filter/Util lib/PerlIO lib/Sys lib/Thread
+	-rmdir lib/B lib/Data lib/Digest lib/Encode lib/IO/Socket lib/IO lib/Filter/Util lib/List lib/MIME lib/PerlIO lib/Scalar lib/Sys lib/Thread lib/XS
 
 _realcleaner: 
 	@$(LDLIBPTH) $(MAKE) _cleaner1 CLEAN=realclean
@@ -877,19 +878,20 @@ test_prep: miniperl ./perl$(EXE_EXT) preplibrary utilities $(dynamic_ext) $(nonx
 	PERL=./perl $(MAKE) _test_prep
 
 _test_tty:
-	cd t && $(LDLIBPTH) $(PERL_DEBUG) $(PERL) TEST $(UTF8) </dev/tty
+	cd t && $(LDLIBPTH) $(PERL_DEBUG) $(PERL) TEST $(TEST_ARGS) </dev/tty
 
 _test_notty:
-	cd t && $(LDLIBPTH) $(PERL_DEBUG) PERL_SKIP_TTY_TEST=1 $(PERL) TEST $(UTF8)
+	cd t && $(LDLIBPTH) $(PERL_DEBUG) PERL_SKIP_TTY_TEST=1 $(PERL) TEST $(TEST_ARGS)
 
 # The second branch is for testing without a tty or controlling terminal,
 # see t/op/stat.t
 _test:
 	if (true </dev/tty) >/dev/null 2>&1; then \
-	  $(MAKE) _test_tty; \
+	  $(MAKE) TEST_ARGS=$(TEST_ARGS) _test_tty   ; \
 	else \
-	  $(MAKE) _test_notty; \
+	  $(MAKE) TEST_ARGS=$(TEST_ARGS) _test_notty ; \
 	fi
+	@echo "Ran tests" > t/rantests
 
 test check: test_prep
 	PERL=./perl $(MAKE) _test
@@ -901,9 +903,9 @@ test_notty: test_prep
 	PERL=./perl $(MAKE) _test_notty
 
 utest ucheck: test_prep
-	PERL=./perl UTF8=-utf8 $(MAKE) _test
+	PERL=./perl TEST_ARGS=-utf8 $(MAKE) _test
 
-# Backward compat.
+test-prep:	test_prep
 
 test-tty:	test_tty
 
@@ -918,11 +920,19 @@ test.third check.third:	test_prep.third perl.third
 	PERL=./perl.third PERL_DEBUG=PERL_3LOG=1 $(MAKE) _test
 
 utest.third ucheck.third: test_prep.third perl.third
-	PERL=./perl.third PERL_DEBUG=PERL_3LOG=1UTF=-utf8 $(MAKE) _test
+	PERL=./perl.third PERL_DEBUG=PERL_3LOG=1 TEST_ARGS=-utf8 $(MAKE) _test
 
 test_notty.third: test_prep.third perl.third
 	PERL=./perl.third $(MAKE) PERL_DEBUG=PERL_3LOG=1 _test_notty
 
+# Targets for Deparse testing.
+
+test.deparse:	test_prep
+	PERL=./perl TEST_ARGS=-deparse $(MAKE) _test
+
+test_notty.deparse:	test_prep
+	PERL=./perl TEST_ARGS=-deparse $(MAKE) _test_notty
+
 # Can't depend on lib/Config.pm because that might be where miniperl
 # is crashing.
 minitest: miniperl lib/re.pm