Restore a reference to $perlpath. Installation needs it

[perl5.git] / Makefile.SH

diff --git a/Makefile.SH b/Makefile.SH
index 3cf2939..6212c0d 100755 (executable)
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -34,6 +34,9 @@ esac
 # Mentioned for the same reason for future reference
 # #23434 $d_strlcat $d_strlcpy
 
 # Mentioned for the same reason for future reference
 # #23434 $d_strlcat $d_strlcpy
 

+# H.Merijn Brand [21 Dec 2010]
+# cbeaa1895 removed the reference to $perlpath
+

 : This forces SH files to create target in same directory as SH file.
 : This is so that make depend always knows where to find SH derivatives.
 case "$0" in
 : This forces SH files to create target in same directory as SH file.
 : This is so that make depend always knows where to find SH derivatives.
 case "$0" in


@@ -472,7 +475,7 @@ mini_obj =  $(obj1) $(obj2) $(obj3) $(ARCHOBJS) $(DTRACE_O)
 ndt_obj = $(obj0) $(obj1) $(obj2) $(obj3) $(ARCHOBJS)
 obj = $(ndt_obj) $(DTRACE_O)
 
 ndt_obj = $(obj0) $(obj1) $(obj2) $(obj3) $(ARCHOBJS)
 obj = $(ndt_obj) $(DTRACE_O)
 

-perltoc_pod_prereqs = extra.pods pod/perl5138delta.pod pod/perlapi.pod pod/perlintern.pod pod/perlmodlib.pod pod/perluniprops.pod
+perltoc_pod_prereqs = extra.pods pod/perl5139delta.pod pod/perlapi.pod pod/perlintern.pod pod/perlmodlib.pod pod/perluniprops.pod

 generated_pods = pod/perltoc.pod $(perltoc_pod_prereqs)
 
 Icwd = -Idist/Cwd -Idist/Cwd/lib
 generated_pods = pod/perltoc.pod $(perltoc_pod_prereqs)
 
 Icwd = -Idist/Cwd -Idist/Cwd/lib


@@ -1028,8 +1031,8 @@ pod/perlintern.pod: $(MINIPERL_EXE) autodoc.pl embed.fnc
 pod/perlmodlib.pod: $(MINIPERL_EXE) pod/perlmodlib.PL MANIFEST
        $(MINIPERL) $(Icwd) pod/perlmodlib.PL -q
 
 pod/perlmodlib.pod: $(MINIPERL_EXE) pod/perlmodlib.PL MANIFEST
        $(MINIPERL) $(Icwd) pod/perlmodlib.PL -q
 

-pod/perl5138delta.pod: pod/perldelta.pod
-       $(LNS) perldelta.pod pod/perl5138delta.pod
+pod/perl5139delta.pod: pod/perldelta.pod
+       $(LNS) perldelta.pod pod/perl5139delta.pod

 
 extra.pods: $(MINIPERL_EXE)
        -@test ! -f extra.pods || rm -f `cat extra.pods`
 
 extra.pods: $(MINIPERL_EXE)
        -@test ! -f extra.pods || rm -f `cat extra.pods`


@@ -1352,11 +1355,9 @@ $(FIRSTMAKEFILE):        README $(MAKEDEPEND)
 config.h: config_h.SH config.sh
        $(SHELL) config_h.SH
 
 config.h: config_h.SH config.sh
        $(SHELL) config_h.SH
 

-# When done, touch perlmain.c so that it doesn't get remade each time.

 .PHONY: depend
 depend: makedepend
        sh ./makedepend MAKE=$(MAKE)
 .PHONY: depend
 depend: makedepend
        sh ./makedepend MAKE=$(MAKE)

-       - test -s perlmain.c && touch perlmain.c

        cd x2p; $(MAKE) depend
 
 # Cannot postpone this until $firstmakefile is ready ;-)
        cd x2p; $(MAKE) depend
 
 # Cannot postpone this until $firstmakefile is ready ;-)