X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.SH;h=051884d7390b9a54dfa3e4c2d245ffc5cb9ebaba;hb=218659229ea7e7f2d98c1a7697e6218c585dfb37;hp=b1f13599cbb318adb89c142f8c79e5de6fe15abc;hpb=5fe84fd29acaf55c3d2b93f4d6ba263d0ef2be35;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/Makefile.SH b/Makefile.SH
index b1f1359..051884d 100644
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -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
 
@@ -506,14 +507,14 @@ quantperl: $& perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs
 
 # Third Degree Perl (Tru64 only)
 
-perl.config.-g:
+perl.config.dashg:
 	@echo "Checking optimize='-g'..."
 	@grep "^optimize=" config.sh
 	@grep -q "^optimize='-g'" config.sh || exit 1
 
 perl.third.config: config.sh
 	@echo "To build perl.third you must Configure -Doptimize=-g -Uusemymalloc, checking..."
-	$(MAKE) perl.config.-g
+	@$(MAKE) perl.config.dashg
 	@echo "Checking usemymalloc='n'..."
 	@grep "^usemymalloc=" config.sh
 	@grep -q "^usemymalloc='n'" config.sh || exit 1
@@ -523,17 +524,17 @@ perl.third: /usr/bin/atom perl.third.config perl
 
 # Pixie Perls (Tru64 and IRIX only)
 
-perl.pixie.atom.config: config.sh
+perl.pixie.config: config.sh
 	@echo "To build perl.pixie you must Configure -Doptimize=-g, checking..."
-	$(MAKE) perl.config.-g
+	@$(MAKE) perl.config.dashg
 
-perl.pixie.atom: /usr/bin/atom perl.pixie.atom.config perl
+perl.pixie.atom: /usr/bin/atom perl
 	atom -tool pixie -L. -all -toolargs="-quiet" perl
 
 perl.pixie.irix: perl
 	pixie perl
 
-perl.pixie: perl
+perl.pixie: /usr/bin/pixie perl.pixie.config perl
 	if test -x /usr/bin/atom; then \
 	  $(MAKE) perl.pixie.atom; \
 	else \
@@ -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; \
@@ -581,13 +582,15 @@ lib/ExtUtils/Miniperl.pm: miniperlmain.c miniperl minimod.pl lib/Config.pm
 	sh mv-if-diff minimod.tmp $@
 
 lib/re.pm: ext/re/re.pm
-	rm -f $@
+	@-rm -f $@
 	cat ext/re/re.pm > $@
 
 $(plextract):	miniperl lib/Config.pm
+	@-rm -f $@
 	$(LDLIBPTH) ./miniperl -Ilib $@.PL
 
 lib/lib.pm:	miniperl lib/Config.pm
+	@-rm -f $@
 	$(LDLIBPTH) ./miniperl -Ilib lib/lib_pm.PL
 
 extra.pods: miniperl
@@ -603,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:
@@ -790,7 +793,8 @@ _mopup:
 	-rm -f perl.exp ext.libs extra.pods opmini.o
 	-rm -f perl.export perl.dll perl.libexp perl.map perl.def
 	-rm -f perl.loadmap miniperl.loadmap perl.prelmap miniperl.prelmap
-	-rm -f perl.third lib*.so.perl.third perl.3log t/perl.3log
+	-rm -f perl.third lib*.so.perl.third perl.3log t/perl.third t/perl.3log
+	-rm -f perl.pixie lib*.so.perl.pixie lib*.so.Addrs
 	-rm -f perl.Addrs perl.Counts t/perl.Addrs t/perl.Counts
 	rm -f perl suidperl miniperl $(LIBPERL) libperl.* microperl
 
@@ -823,7 +827,7 @@ _cleaner2:
 	rm -f h2ph.man pstruct
 	rm -rf .config
 	rm -f testcompile compilelog
-	-rmdir lib/B lib/Data lib/Encode lib/IO/Socket lib/IO lib/Filter/Util 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
@@ -887,6 +891,7 @@ _test:
 	else \
 	  $(MAKE) _test_notty; \
 	fi
+	@echo "Ran tests" > t/rantests
 
 test check: test_prep
 	PERL=./perl $(MAKE) _test
@@ -900,7 +905,7 @@ test_notty: test_prep
 utest ucheck: test_prep
 	PERL=./perl UTF8=-utf8 $(MAKE) _test
 
-# Backward compat.
+test-prep:	test_prep
 
 test-tty:	test_tty