Integrate from maint:

[p5sagit/p5-mst-13.2.git] / win32 / makefile.mk

diff --git a/win32/makefile.mk b/win32/makefile.mk
index 723d5b2..d01284e 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -591,6 +591,7 @@ UTILS               =                       \
                ..\utils\libnetcfg      \
                ..\utils\enc2xs         \
                ..\utils\piconv         \
+               ..\utils\cpan           \
                ..\pod\checkpods        \
                ..\pod\pod2html         \
                ..\pod\pod2latex        \
@@ -817,11 +818,12 @@ CFG_VARS  =                                       \
                _a=$(a)                         ~       \
                lib_ext=$(a)                    ~       \
                static_ext=$(STATIC_EXT)        ~       \
+               usethreads=$(USE_ITHREADS)      ~       \
                useithreads=$(USE_ITHREADS)     ~       \
                usemultiplicity=$(USE_MULTI)    ~       \
                useperlio=$(USE_PERLIO)         ~       \
-               uselargefiles=$(USE_LARGE_FILES) ~      \
-               LINK_FLAGS=$(LINK_FLAGS:s/\/\\/) ~      \
+               uselargefiles=$(USE_LARGE_FILES)        ~       \
+               LINK_FLAGS=$(LINK_FLAGS:s/\/\\/)        ~       \
                optimize=$(OPTIMIZE)
 
 #
@@ -1191,7 +1193,7 @@ distclean: clean
            perlwin32.pod pod2html pod2latex pod2man pod2text pod2usage \
            podchecker podselect
        -cd ..\utils && del /f h2ph splain perlbug pl2pm c2ph pstruct h2xs \
-           perldoc perlivp dprofpp perlcc libnetcfg enc2xs piconv *.bat
+           perldoc perlivp dprofpp perlcc libnetcfg enc2xs piconv cpan *.bat
        -cd ..\x2p && del /f find2perl s2p psed *.bat
        -del /f ..\config.sh ..\splittree.pl perlmain.c dlutils.c config.h.new
        -del /f $(CONFIGPM)