Another makefile portability fix for Win32 by Steve Hay.

p4raw-id: //depot/perl@22467

diff --git a/win32/Makefile b/win32/Makefile
index 198d69d..f99a01a 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -349,10 +349,6 @@ LIBC       = msvcrt.lib
 LIBC   = PerlCRT.lib
 !ENDIF
 
-PERLEXE_ICO    = perlexe.ico
-PERLEXE_RES    = perlexe.res
-PERLDLL_RES    =
-
 !IF  "$(CFG)" == "Debug"
 !  IF "$(CCTYPE)" == "MSVC20"
 OPTIMIZE       = -Od -MD -Z7 -DDEBUGGING
@@ -448,6 +444,10 @@ CONFIGPM   = ..\lib\Config.pm
 MINIMOD                = ..\lib\ExtUtils\Miniperl.pm
 X2P            = ..\x2p\a2p.exe
 
+PERLEXE_ICO    = .\perlexe.ico
+PERLEXE_RES    = .\perlexe.res
+PERLDLL_RES    =
+
 # Nominate a target which causes extensions to be re-built
 # This used to be $(PERLEXE), but at worst it is the .dll that they depend
 # on and really only the interface - i.e. the .def file used to export symbols

diff --git a/win32/makefile.mk b/win32/makefile.mk
index a0eb3cd..e89b472 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -450,10 +450,6 @@ LIBC       = msvcrt.lib
 LIBC   = PerlCRT.lib
 .ENDIF
 
-PERLEXE_ICO    = .\perlexe.ico
-PERLEXE_RES    = .\perlexe.res
-PERLDLL_RES    =
-
 .IF  "$(CFG)" == "Debug"
 .IF "$(CCTYPE)" == "MSVC20"
 OPTIMIZE       = -Od -MD -Z7 -DDEBUGGING
@@ -571,6 +567,10 @@ CONFIGPM   = ..\lib\Config.pm
 MINIMOD                = ..\lib\ExtUtils\Miniperl.pm
 X2P            = ..\x2p\a2p.exe
 
+PERLEXE_ICO    = .\perlexe.ico
+PERLEXE_RES    = .\perlexe.res
+PERLDLL_RES    =
+
 # Nominate a target which causes extensions to be re-built
 # This used to be $(PERLEXE), but at worst it is the .dll that they depend
 # on and really only the interface - i.e. the .def file used to export symbols