In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/89f6f7bc072be92fbdc3167f0fe42f3ddb5f171d?hp=1299eb144ab48940fecb7865750908c77577bfd5>
- Log ----------------------------------------------------------------- commit 89f6f7bc072be92fbdc3167f0fe42f3ddb5f171d Author: Steve Hay <[email protected]> Date: Thu Sep 24 11:40:51 2009 +0100 Fix Win32 Makefile generation Change 200cbd6 (mistakenly reverted by 1487aac but then re-applied by 2f30d0d) was first assimilated by EU-MM in 6.50, but it was assimilated wrongly: the tabs were converted to spaces. Somehow that didn't find its way back into the core when 6.50 was integrated (76467b2), but did when 6.52 was integrated (5bdf71c). I've only recently noticed it when I found that building blead with dmake fell over in the Win32CORE build with the error: dmake: makefile: line 454: Error: -- An AUGMAKE meta target must not be mixed with non AUGMAKE meta targets, offending target [.manifest] Restoring the tabs fixes this, and the build now works with dmake again. ----------------------------------------------------------------------- Summary of changes: ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win32.pm | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win32.pm b/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win32.pm index 1a5bbf0..d3a5a4d 100644 --- a/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win32.pm +++ b/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win32.pm @@ -329,8 +329,8 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(BOOTSTRAP) $(INST_ARCHAUTODIR)$(DFSEP). # Embed the manifest file if it exists push(@m, q{ - if exist [email protected] mt -nologo -manifest [email protected] -outputresource:$@;2 - if exist [email protected] del [email protected]}); + if exist [email protected] mt -nologo -manifest [email protected] -outputresource:$@;2 + if exist [email protected] del [email protected]}); } push @m, ' $(CHMOD) $(PERM_RWX) $@ -- Perl5 Master Repository
