From: Nicholas Clark Date: Sun, 19 Apr 2009 19:49:38 +0000 (+0100) Subject: In the Makefile, no need to change into pod/ to create symlinks to READMEs etc. X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=e0be038f1205193cc1aaea93032983c220ad6f39;p=p5sagit%2Fp5-mst-13.2.git In the Makefile, no need to change into pod/ to create symlinks to READMEs etc. --- diff --git a/Makefile.SH b/Makefile.SH index f7532dc..e1f88c1 100644 --- a/Makefile.SH +++ b/Makefile.SH @@ -975,18 +975,18 @@ pod/perlapi.pod pod/perlintern.pod: miniperl$(EXE_EXT) autodoc.pl embed.fnc $(RUN) ./miniperl$(EXE_EXT) -Ilib autodoc.pl pod/perldelta.pod: pod/perl5110delta.pod - cd pod && $(LNS) perl5110delta.pod perldelta.pod + $(LNS) perl5110delta.pod pod/perldelta.pod extra.pods: miniperl$(EXE_EXT) -@test ! -f extra.pods || rm -f `cat extra.pods` -@rm -f extra.pods -@for x in `grep -l '^=[a-z]' README.* | grep -v README.vms` ; do \ nx=`echo $$x | sed -e "s/README\.//"`; \ - cd pod ; $(LNS) ../$$x "perl"$$nx".pod" ; cd .. ; \ + $(LNS) ../$$x "pod/perl"$$nx".pod" ; \ echo "pod/perl"$$nx".pod" >> extra.pods ; \ done -@rm -f pod/perlvms.pod - -@test -f vms/perlvms.pod && cd pod && $(LNS) ../vms/perlvms.pod perlvms.pod && cd .. && echo "pod/perlvms.pod" >> extra.pods + -@test -f vms/perlvms.pod && $(LNS) ../vms/perlvms.pod pod/perlvms.pod && echo "pod/perlvms.pod" >> extra.pods extras.make: perl$(EXE_EXT) -@test ! -s extras.lst || PATH="`pwd`:${PATH}" PERL5LIB="`pwd`/lib" $(LDLIBPTH) $(RUN) ./perl -Ilib -MCPAN -e '@ARGV&&make(@ARGV)' `cat extras.lst` diff --git a/pod/buildtoc b/pod/buildtoc index 1ca0fdb..31eb1cd 100644 --- a/pod/buildtoc +++ b/pod/buildtoc @@ -706,14 +706,14 @@ sub do_unix { $makefile_SH =~ s!( pod/perl[a-z0-9_]+\.pod: pod/perl[a-z0-9_]+\.pod - cd pod && \$\(LNS\) perl[a-z0-9_]+\.pod perl[a-z0-9_]+\.pod + \$\(LNS\) perl[a-z0-9_]+\.pod pod/perl[a-z0-9_]+\.pod )+!\0!gm; verify_contiguous($name, $makefile_SH, 'copy rules'); my @copy_rules = map " pod/$_: pod/$Copies{$_} - cd pod && \$(LNS) $Copies{$_} $_ + \$(LNS) $Copies{$_} pod/$_ ", keys %Copies; $makefile_SH =~ s/\0+/join '', @copy_rules/se;