From: Steve Hay <SteveHay@planit.com>
Date: Thu, 16 Jun 2005 09:51:33 +0000 (+0000)
Subject: Fix changes 24862 and 24863 for Sarathy's old dmake
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=7a67865adbea98917830ba110adf80e1a4ee46ab;p=p5sagit%2Fp5-mst-13.2.git

Fix changes 24862 and 24863 for Sarathy's old dmake

p4raw-id: //depot/perl@24866
---

diff --git a/win32/makefile.mk b/win32/makefile.mk
index 430913e..0f35355 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -1088,13 +1088,13 @@ $(PERLDLL): perldll.def $(PERLDLL_OBJ) $(PERLDLL_RES) Extensions_static
 	$(LINK32) -Tpd -ap $(BLINK_FLAGS) \
 	    @$(mktmp c0d32$(o) $(PERLDLL_OBJ:s,\,$B,)$N \
 		$@,$N \
-	        $(shell @type Extensions_static) $(LIBFILES)$N \
+	        $(subst,\,$B $(shell @type Extensions_static)) $(LIBFILES)$N \
 		perldll.def$N)
 	$(IMPLIB) $*.lib $@
 .ELIF "$(CCTYPE)" == "GCC"
 	$(LINK32) -mdll -o $@ -Wl,--base-file -Wl,perl.base $(BLINK_FLAGS) \
 	    $(mktmp $(LKPRE) $(PERLDLL_OBJ:s,\,$B,) \
-	        $(shell @type Extensions_static) \
+	        $(subst,\,$B $(shell @type Extensions_static)) \
 	        $(LIBFILES) $(LKPOST))
 	dlltool --output-lib $(PERLIMPLIB) \
 		--dllname $(PERLDLL:b).dll \
@@ -1103,7 +1103,7 @@ $(PERLDLL): perldll.def $(PERLDLL_OBJ) $(PERLDLL_RES) Extensions_static
 		--output-exp perl.exp
 	$(LINK32) -mdll -o $@ $(BLINK_FLAGS) \
 	    $(mktmp $(LKPRE) $(PERLDLL_OBJ:s,\,$B,) \
-	        $(shell @type Extensions_static) \
+	        $(subst,\,$B $(shell @type Extensions_static)) \
 	        $(LIBFILES) perl.exp $(LKPOST))
 .ELSE
 	$(LINK32) -dll -def:perldll.def -out:$@ \