Revert #29307. It doesn't fix the XXX after all. Using "$(shell @type )"

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

diff --git a/win32/makefile.mk b/win32/makefile.mk
index 32e6b9e..80454ca 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -1008,7 +1008,12 @@ all : .\config.h $(GLOBEXE) $(MINIPERL) $(MK2)           \
        $(RIGHTMAKE) $(MINIMOD) $(CONFIGPM) $(UNIDATAFILES) $(PERLEXE)  \
        $(X2P) MakePPPort Extensions $(PERLSTATIC)
 
-reonly : .\config.h $(GLOBEXE) $(MINIPERL) $(MK2)              \
+..\regnodes.h : ..\regcomp.sym
+       cd .. && regcomp.pl && cd win32
+
+regnodes : ..\regnodes.h
+
+reonly : regnodes .\config.h $(GLOBEXE) $(MINIPERL) $(MK2)             \
        $(RIGHTMAKE) $(MINIMOD) $(CONFIGPM) $(UNIDATAFILES) $(PERLEXE)  \
        $(X2P) Extensions_reonly
 
@@ -1498,6 +1503,7 @@ install : all installbare installhtml
 installbare : $(RIGHTMAKE) utils
        $(PERLEXE) ..\installperl
        if exist $(WPERLEXE) $(XCOPY) $(WPERLEXE) $(INST_BIN)\*.*
+       if exist $(PERLEXESTATIC) $(XCOPY) $(PERLEXESTATIC) $(INST_BIN)\*.*
        $(XCOPY) $(GLOBEXE) $(INST_BIN)\*.*
        if exist ..\perl*.pdb $(XCOPY) ..\perl*.pdb $(INST_BIN)\*.*
        if exist ..\x2p\a2p.pdb $(XCOPY) ..\x2p\a2p.pdb $(INST_BIN)\*.*
@@ -1551,9 +1557,6 @@ test-reonly : reonly utils
 regen :
        cd .. && regen.pl && cd win32
 
-regnodes :
-       cd .. && regcomp.pl && cd win32
-
 test-notty : test-prep
        set PERL_SKIP_TTY_TEST=1 && \
            cd ..\t && $(PERLEXE) -I.\lib harness $(TEST_SWITCHES) $(TEST_FILES)