From: Gurusamy Sarathy <gsar@cpan.org>
Date: Fri, 29 May 1998 01:32:41 +0000 (+0000)
Subject: [win32] integrate mainline
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=8957be0a1f3029314645d52181b0ef9bfb2ea9a5;p=p5sagit%2Fp5-mst-13.2.git

[win32] integrate mainline

p4raw-id: //depot/win32/perl@1050
---

8957be0a1f3029314645d52181b0ef9bfb2ea9a5
diff --cc win32/Makefile
index d860a3c,d860a3c..a1b037f
--- a/win32/Makefile
+++ b/win32/Makefile
@@@ -530,7 -530,7 +530,7 @@@ perlmain.c : runperl.
  	copy runperl.c perlmain.c
  
  perlmain$(o) : perlmain.c
--	$(CC) $(CFLAGS_O) -UPERLDLL $(EXEOUT_FLAG)$@ -c perlmain.c
++	$(CC) $(CFLAGS_O) -UPERLDLL $(OBJOUT_FLAG)$@ -c perlmain.c
  
  $(PERLEXE): $(PERLDLL) $(CONFIGPM) $(PERLEXE_OBJ)
  	$(LINK32) -subsystem:console -out:$@ $(LINK_FLAGS) $(LIBFILES) \
diff --cc win32/makefile.mk
index e77713c,e77713c..c04fe69
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@@ -691,13 -691,13 +691,13 @@@ perlmain.c : runperl.
  	copy runperl.c perlmain.c
  
  perlmain$(o) : perlmain.c
--	$(CC) $(CFLAGS_O) -UPERLDLL $(EXEOUT_FLAG)$@ -c perlmain.c
++	$(CC) $(CFLAGS_O) -UPERLDLL $(OBJOUT_FLAG)$@ -c perlmain.c
  
  $(PERLEXE): $(PERLDLL) $(CONFIGPM) $(PERLEXE_OBJ)
  .IF "$(CCTYPE)" == "BORLAND"
  	$(LINK32) -Tpe -ap $(LINK_FLAGS) \
--	    @$(mktmp c0x32$(o) $(PERLEXE_OBJ)\n \
--	    $@,\n \
++	    @$(mktmp c0x32$(o) $(PERLEXE_OBJ:s,\,\\)\n \
++	    $(@:s,\,\\),\n \
  	    $(PERLIMPLIB) $(LIBFILES)\n)
  .ELIF "$(CCTYPE)" == "GCC"
  	$(LINK32) -o $@ $(LINK_FLAGS)  \