From: Gurusamy Sarathy <gsar@cpan.org>
Date: Mon, 22 Jun 1998 15:56:27 +0000 (+0000)
Subject: tweak win32 makefiles for PERL_OBJECT build
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=5fd76c3eeb1994c1e03de1e249e9fd19c16eac1c;p=p5sagit%2Fp5-mst-13.2.git

tweak win32 makefiles for PERL_OBJECT build

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

diff --git a/win32/Makefile b/win32/Makefile
index a0f1d00..89ec4de 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -72,9 +72,9 @@ INST_VER	= \5.00467
 #
 # set this if you wish to use perl's malloc
 # WARNING: Turning this on/off WILL break binary compatibility with extensions
-# you may have compiled with/without it.  Be prepared to recompile all extensions
-# if you change the default.  Currently, this cannot be enabled if you ask for
-# PERL_OBJECT above.
+# you may have compiled with/without it.  Be prepared to recompile all
+# extensions if you change the default.  Currently, this cannot be enabled
+# if you ask for PERL_OBJECT above.
 #
 #PERL_MALLOC	= define
 
@@ -516,7 +516,7 @@ CFG_VARS	=					\
 		"d_mymalloc=$(PERL_MALLOC)"		\
 		"libs=$(LIBFILES)"			\
 		"incpath=$(CCINCDIR)"			\
-		"libperl=$(PERLIMPLIB)"			\
+		"libperl=$(PERLIMPLIB:..\=)"			\
 		"libpth=$(CCLIBDIR) $(EXTRALIBDIRS)"	\
 		"libc=$(LIBC)"				\
 		"make=nmake"				\
diff --git a/win32/makefile.mk b/win32/makefile.mk
index f0e258d..80d8546 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -79,9 +79,9 @@ CCTYPE		*= BORLAND
 #
 # set this if you wish to use perl's malloc
 # WARNING: Turning this on/off WILL break binary compatibility with extensions
-# you may have compiled with/without it.  Be prepared to recompile all extensions
-# if you change the default.  Currently, this cannot be enabled if you ask for
-# PERL_OBJECT above.
+# you may have compiled with/without it.  Be prepared to recompile all
+# extensions if you change the default.  Currently, this cannot be enabled
+# if you ask for PERL_OBJECT above.
 #
 #PERL_MALLOC	*= define
 
@@ -543,7 +543,7 @@ CORE_H		= $(CORE_NOCFG_H) .\config.h
 MICROCORE_OBJ	= $(MICROCORE_SRC:db:+$(o))
 CORE_OBJ	= $(MICROCORE_OBJ) $(EXTRACORE_SRC:db:+$(o))
 WIN32_OBJ	= $(WIN32_SRC:db:+$(o))
-MINICORE_OBJ	= $(MINIDIR)\{$(MICROCORE_OBJ:f) miniperlmain$(o) $(EXTRACORE_SRC:db:+$(o))}
+MINICORE_OBJ	= $(MINIDIR)\{$(MICROCORE_OBJ:f) miniperlmain$(o) perlio$(o)}
 MINIWIN32_OBJ	= $(MINIDIR)\{$(WIN32_OBJ:f)}
 MINI_OBJ	= $(MINICORE_OBJ) $(MINIWIN32_OBJ)
 PERL95_OBJ	= $(PERL95_SRC:db:+$(o))