[perl.git] branch blead, updated. GitLive-blead-2399-g83d5895

[Nicholas Clark]

In perl.git, the branch blead has been updated

<http://perl5.git.perl.org/perl.git/commitdiff/83d5895a155b275741e82edebaa0001c30f04f4d?hp=a2ac9a71fd041588f93167970d1121ded5605f26>

- Log -----------------------------------------------------------------
commit 83d5895a155b275741e82edebaa0001c30f04f4d
Author: Nicholas Clark <***@ccl4.org>
Date: Thu Sep 24 18:45:13 2009 +0100

Win32 should look for extensions in ..\cpan as well as ..\ext

With whitespace fixes by Max Maischein <***@corion.net>
-----------------------------------------------------------------------

Summary of changes:
win32/makefile.mk | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/win32/makefile.mk b/win32/makefile.mk
index 2bb2014..5fdcf07 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -395,6 +395,7 @@ COREDIR = ..\lib\CORE
AUTODIR = ..\lib\auto
LIBDIR = ..\lib
EXTDIR = ..\ext
+CPANDIR = ..\cpan
PODDIR = ..\pod
EXTUTILSDIR = $(LIBDIR)\ExtUtils
HTMLDIR = .\html
@@ -1372,30 +1373,30 @@ MakePPPort_clean:
# DynaLoader.pm, so this will have to do
Extensions : ..\make_ext.pl $(PERLDEP) $(CONFIGPM) $(DYNALOADER)
$(XCOPY) ..\*.h $(COREDIR)\*.*
- $(MINIPERL) -I..\lib ..\make_ext.pl "MAKE=$(MAKE)" --dir=$(EXTDIR) --dynamic
+ $(MINIPERL) -I..\lib ..\make_ext.pl "MAKE=$(MAKE)" --dir=$(EXTDIR) --dir=$(CPANDIR) --dynamic

Extensions_reonly : ..\make_ext.pl $(PERLDEP) $(CONFIGPM) $(DYNALOADER)
$(XCOPY) ..\*.h $(COREDIR)\*.*
- $(MINIPERL) -I..\lib ..\make_ext.pl "MAKE=$(MAKE)" --dir=$(EXTDIR) --dynamic +re
+ $(MINIPERL) -I..\lib ..\make_ext.pl "MAKE=$(MAKE)" --dir=$(EXTDIR) --dir=$(CPANDIR) --dynamic +re

Extensions_static : ..\make_ext.pl list_static_libs.pl $(PERLDEP) $(CONFIGPM)
$(XCOPY) ..\*.h $(COREDIR)\*.*
- $(MINIPERL) -I..\lib ..\make_ext.pl "MAKE=$(MAKE)" --dir=$(EXTDIR) --static
+ $(MINIPERL) -I..\lib ..\make_ext.pl "MAKE=$(MAKE)" --dir=$(EXTDIR) --dir=$(CPANDIR) --static
$(MINIPERL) -I..\lib list_static_libs.pl > Extensions_static

Extensions_nonxs : ..\make_ext.pl $(PERLDEP) $(CONFIGPM)
$(XCOPY) ..\*.h $(COREDIR)\*.*
- $(MINIPERL) -I..\lib ..\make_ext.pl "MAKE=$(MAKE)" --dir=$(EXTDIR) --nonxs
+ $(MINIPERL) -I..\lib ..\make_ext.pl "MAKE=$(MAKE)" --dir=$(EXTDIR) --dir=$(CPANDIR) --nonxs

$(DYNALOADER) : ..\make_ext.pl $(PERLDEP) $(CONFIGPM) Extensions_nonxs
$(XCOPY) ..\*.h $(COREDIR)\*.*
$(MINIPERL) -I..\lib ..\make_ext.pl "MAKE=$(MAKE)" --dir=$(EXTDIR) --dynaloader

Extensions_clean :
- -if exist $(MINIPERL) $(MINIPERL) -I..\lib ..\make_ext.pl "MAKE=$(MAKE)" --dir=$(EXTDIR) --all --target=clean
+ -if exist $(MINIPERL) $(MINIPERL) -I..\lib ..\make_ext.pl "MAKE=$(MAKE)" --dir=$(EXTDIR) --dir=$(CPANDIR) --all --target=clean

Extensions_realclean :
- -if exist $(MINIPERL) $(MINIPERL) -I..\lib ..\make_ext.pl "MAKE=$(MAKE)" --dir=$(EXTDIR) --all --target=realclean
+ -if exist $(MINIPERL) $(MINIPERL) -I..\lib ..\make_ext.pl "MAKE=$(MAKE)" --dir=$(EXTDIR) --dir=$(CPANDIR) --all --target=realclean

#-------------------------------------------------------------------------------

@@ -1537,6 +1538,7 @@ distclean: realclean
-del /f perl.base
-cd .. && del /s *$(a) *.map *.pdb *.ilk *.tds *.bs *$(o) .exists pm_to_blib
-cd $(EXTDIR) && del /s *.def Makefile Makefile.old
+ -cd $(CPANDIR) && del /s *.def Makefile Makefile.old
-if exist $(AUTODIR) rmdir /s /q $(AUTODIR)
-if exist $(COREDIR) rmdir /s /q $(COREDIR)
-if exist pod2htmd.tmp del pod2htmd.tmp

--
Perl5 Master Repository

[Steve Hay]

Post by Nicholas Clark
In perl.git, the branch blead has been updated
<http://perl5.git.perl.org/perl.git/commitdiff/83d5895a155b275741e82edebaa0001c30f04f4d?hp=a2ac9a71fd041588f93167970d1121ded5605f26>
- Log -----------------------------------------------------------------
commit 83d5895a155b275741e82edebaa0001c30f04f4d
Date:   Thu Sep 24 18:45:13 2009 +0100
   Win32 should look for extensions in ..\cpan as well as ..\ext
-----------------------------------------------------------------------
 win32/makefile.mk |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/win32/makefile.mk b/win32/makefile.mk

Surely win32/Makefile will need this too?