summaryrefslogtreecommitdiff
path: root/Makefile.SH
diff options
context:
space:
mode:
authorFlorian Ragwitz <rafl@debian.org>2010-08-22 10:43:37 +0200
committerFlorian Ragwitz <rafl@debian.org>2010-09-05 16:33:07 +0200
commit37ee6528ceb851db13e05a01624da3118149a953 (patch)
tree00b909d2acee56c51bc2a6404dcc064d6a89e831 /Makefile.SH
parent8e7870e793b7ed3fb14a2fd89a50e51657403695 (diff)
downloadperl-37ee6528ceb851db13e05a01624da3118149a953.tar.gz
Move the latest perldelta to pod/perldelta.pod
This way patches including perldelta entries will apply properly, no matter when they are applied. If there's conflicts, they'll at least be in the right file.
Diffstat (limited to 'Makefile.SH')
-rwxr-xr-xMakefile.SH6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.SH b/Makefile.SH
index 5948f4dd1e..89d5c44df0 100755
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -483,7 +483,7 @@ mini_obj = $(obj1) $(obj2) $(obj3) $(ARCHOBJS) $(DTRACE_O)
ndt_obj = $(obj0) $(obj1) $(obj2) $(obj3) $(ARCHOBJS)
obj = $(ndt_obj) $(DTRACE_O)
-perltoc_pod_prereqs = extra.pods pod/perlapi.pod pod/perldelta.pod pod/perlintern.pod pod/perlmodlib.pod pod/perluniprops.pod
+perltoc_pod_prereqs = extra.pods pod/perl5135delta.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
@@ -1024,8 +1024,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/perldelta.pod: pod/perl5135delta.pod
- $(LNS) perl5135delta.pod pod/perldelta.pod
+pod/perl5135delta.pod: pod/perldelta.pod
+ $(LNS) perldelta.pod pod/perl5135delta.pod
extra.pods: $(MINIPERL_EXE)
-@test ! -f extra.pods || rm -f `cat extra.pods`