Upgrade to Encode 1.92.

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

diff --git a/Makefile.SH b/Makefile.SH
index cd18ffb..9fa3257 100644 (file)
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -108,6 +108,13 @@ case "$ldlibpth" in
 esac
 
 case "$osname" in
+linux)
+       case "$useshrplib" in
+       true)
+           ldlibpth="LD_PRELOAD=\"\$\$LD_PRELOAD `pwd`/$libperl\" $ldlibpth"
+           ;;
+       esac
+       ;;
 os390) test -f /bin/env && ldlibpth="/bin/env $ldlibpth"
        ;;
 esac
@@ -812,20 +819,20 @@ SYMH = perlvars.h intrpvar.h thrdvar.h
 CHMOD_W = chmod +w
 
 # The following files are generated automatically
-#      keywords.pl:    keywords.h
-#      opcode.pl:      opcode.h opnames.h pp_proto.h pp.sym
-# [* embed.pl needs pp.sym generated by opcode.pl! *]
-#      embed.pl:       proto.h embed.h embedvar.h global.sym
-#                      perlapi.h perlapi.c pod/perlintern.pod
-#                      pod/perlapi.pod
+#      autodoc.pl:     pod/perlapi.pod pod/perlintern.pod
 #      bytecode.pl:    ext/ByteLoader/byterun.h ext/ByteLoader/byterun.c
 #                      ext/B/B/Asmdata.pm
+#      embed.pl:       proto.h embed.h embedvar.h global.sym
+#                      perlapi.h perlapi.c 
+# [* embed.pl needs pp.sym generated by opcode.pl! *]
+#      keywords.pl:    keywords.h
+#      opcode.pl:      opcode.h opnames.h pp_proto.h pp.sym
 #      regcomp.pl:     regnodes.h
 #      warnings.pl:    warnings.h lib/warnings.pm
 # The correct versions should be already supplied with the perl kit,
 # in case you don't have perl available.
 # To force them to be regenerated, run
-#       perl regen_headers.pl
+#       perl regen.pl
 # with your existing copy of perl
 # (make regen_headers is kept for backwards compatibility)
 
@@ -838,13 +845,13 @@ AUTOGEN_FILES = keywords.h opcode.h opnames.h pp_proto.h pp.sym proto.h \
 
 .PHONY: regen_headers regen_pods regen_all
 
-regen_headers: FORCE
-       -perl regen_headers.pl
+regen regen_headers:   FORCE
+       -perl regen.pl
 
 regen_pods:    FORCE
        -cd pod; $(LDLIBPTH) $(MAKE) regen_pods
 
-regen_all: $(PERLYVMS) regen_headers regen_pods
+regen_all: $(PERLYVMS) regen regen_pods
 
 # Extensions:
 # Names added to $(dynamic_ext) or $(static_ext) or $(nonxs_ext) will
@@ -931,7 +938,7 @@ _cleaner2:
        rm -f t/misctmp* t/forktmp* t/tmp* t/c t/perl$(EXE_EXT) t/rantests
        rm -f so_locations $(LIBPERL_NONSHR) $(MINIPERL_NONSHR)
        rm -rf $(addedbyconf)
-       rm -f $(FIRSTMAKEFILE) $(FIRSTMAKEFILE).old
+       rm -f $(FIRSTMAKEFILE) $(FIRSTMAKEFILE).old makefile.old
        rm -f $(private) lib/Config.pod
        rm -rf lib/auto
        rm -f lib/.exists lib/*/.exists lib/*/*/.exists