VMS patches from Dan Sugalski <sugalskd@osshe.edu>

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

diff --git a/Makefile.SH b/Makefile.SH
index 7e9e384..050e471 100644 (file)
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -177,6 +177,9 @@ ARCHOBJS = $archobjs
 # grrr
 SHELL = $sh
 
+# how to tr(anslate) newlines
+TRNL = '$trnl'
+
 !GROK!THIS!
 
 ## In the following dollars and backticks do not need the extra backslash.
@@ -238,7 +241,8 @@ lintflags = -hbvxac
        $(CCCMD) $(PLDLFLAGS) $*.c
 
 all: $(FIRSTMAKEFILE) miniperl $(private) $(plextract) $(public) $(dynamic_ext) $(nonxs_ext)
-       @echo " "; echo "       Everything is up to date."
+       @echo " ";
+       @echo " Everything is up to date. 'make test' to run test suite."
 
 compile: all
        echo "testing compilation" > testcompile;
@@ -299,6 +303,7 @@ $(LIBPERL): $& perl$(OBJ_EXT) $(obj)
                case "$osname" in
                aix)
                        $spitshell >>Makefile <<'!NO!SUBS!'
+       rm -f libperl$(OBJ_EXT)
        mv $@ libperl$(OBJ_EXT)
        $(AR) qv $(LIBPERL) libperl$(OBJ_EXT)
 !NO!SUBS!
@@ -375,12 +380,17 @@ preplibrary: miniperl lib/Config.pm $(plextract)
 # try 'make minitest' and/or commenting out the tests at the end of configpm.)
 lib/Config.pm: config.sh miniperl configpm
        $(LDLIBPTH) ./miniperl configpm tmp
-       sh mv-if-diff tmp lib/Config.pm
+       sh mv-if-diff tmp $@
 
 lib/ExtUtils/Miniperl.pm: miniperlmain.c miniperl minimod.pl lib/Config.pm
-       $(LDLIBPTH) ./miniperl minimod.pl > tmp && mv tmp $@
+       $(LDLIBPTH) ./miniperl minimod.pl > tmp
+       sh mv-if-diff tmp $@
+
+lib/re.pm: ext/re/re.pm
+       rm -f $@
+       cat ext/re/re.pm > $@
 
-$(plextract):  miniperl lib/Config.pm
+$(plextract):  miniperl lib/Config.pm lib/re.pm
        $(LDLIBPTH) ./miniperl -Ilib $@.PL
        
 install: all install.perl install.man
@@ -391,6 +401,7 @@ install.perl:       all installperl
                cd utils; $(MAKE) compile; \
                cd ../x2p; $(MAKE) compile; \
                cd ../pod; $(MAKE) compile; \
+       else :; \
        fi
        $(LDLIBPTH) ./perl installperl
 
@@ -576,7 +587,7 @@ test-notty: test-prep
 
 # Can't depend on lib/Config.pm because that might be where miniperl
 # is crashing.
-minitest: miniperl
+minitest: miniperl lib/re.pm
        @echo "You may see some irrelevant test failures if you have been unable"
        @echo "to build lib/Config.pm."
        - cd t && (rm -f perl$(EXE_EXT); $(LNS) ../miniperl$(EXE_EXT) perl$(EXE_EXT)) \
@@ -596,16 +607,16 @@ nok:      utilities
        $(LBLIBPTH) ./perl -Ilib utils/perlbug -nok -s '(UNINSTALLED)'
 
 clist: $(c)
-       echo $(c) | tr ' ' '\012' >.clist
+       echo $(c) | tr ' ' $(TRNL) >.clist
 
 hlist:  $(h)
-       echo $(h) | tr ' ' '\012' >.hlist
+       echo $(h) | tr ' ' $(TRNL) >.hlist
 
 shlist: $(sh)
-       echo $(sh) | tr ' ' '\012' >.shlist
+       echo $(sh) | tr ' ' $(TRNL) >.shlist
 
 pllist: $(pl)
-       echo $(pl) | tr ' ' '\012' >.pllist
+       echo $(pl) | tr ' ' $(TRNL) >.pllist
 
 Makefile: Makefile.SH ./config.sh
        $(SHELL) Makefile.SH
@@ -613,7 +624,12 @@ Makefile: Makefile.SH ./config.sh
 distcheck: FORCE
        perl '-MExtUtils::Manifest=&fullcheck' -e 'fullcheck()'
 
-etags:
+elc:   emacs/cperl-mode.elc
+
+emacs/cperl-mode.elc: emacs/cperl-mode.el
+       -cd emacs; emacs -batch -q -no-site-file -f batch-byte-compile cperl-mode.el
+
+etags: emacs/cperl-mode.elc
        sh emacs/ptags
 
 # AUTOMATICALLY GENERATED MAKE DEPENDENCIES--PUT NOTHING BELOW THIS LINE