summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--bcc32/setup.mak9
-rw-r--r--win32/setup.mak9
3 files changed, 15 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index b3ff9000c8..c92ba56653 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Dec 27 21:41:57 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
+
+ * bcc32/setup.mak, win32/setup.mak(-prologue-): move srcdir from
+ CPP input or UNC path will be removed as a comment.
+
Fri Dec 27 17:55:00 2002 Takaaki Uematsu <mail@uema2.cjb.net>
* wince/config, wince/configure.bat: replace 1.7 with 1.8
diff --git a/bcc32/setup.mak b/bcc32/setup.mak
index c53510ae31..c81eaf2020 100644
--- a/bcc32/setup.mak
+++ b/bcc32/setup.mak
@@ -30,17 +30,18 @@ alpha-$(OS): -prologue- -alpha- -epilogue-
-prologue-: nul
@echo Creating $(MAKEFILE)
+ @type > $(MAKEFILE) &&|
+\#\#\# Makefile for ruby $(OS) \#\#\#
+srcdir = $(srcdir:\=/)
+|
@cpp32 -I$(srcdir) -P- -o$(MAKEFILE) > nul &&|
-\#define COMMENT \#
-COMMENT Makefile for ruby $(OS)
\#include "version.h"
MAJOR = RUBY_VERSION_MAJOR
MINOR = RUBY_VERSION_MINOR
TEENY = RUBY_VERSION_TEENY
|
- @copy $(MAKEFILE).i $(MAKEFILE) > nul
+ @type $(MAKEFILE).i >> $(MAKEFILE)
@del $(MAKEFILE).i
- @$(APPEND) srcdir = $(srcdir:\=/)
-generic-: nul
!if defined(PROCESSOR_ARCHITECTURE) || defined(PROCESSOR_LEVEL)
diff --git a/win32/setup.mak b/win32/setup.mak
index 5ae5fcc62c..5f243685ad 100644
--- a/win32/setup.mak
+++ b/win32/setup.mak
@@ -29,14 +29,15 @@ i686-$(OS): -prologue- -i686- -epilogue-
alpha-$(OS): -prologue- -alpha- -epilogue-
-prologue-: nul
- @cl -nologo -EP -I$(srcdir) <<"Creating $(MAKEFILE)" > $(MAKEFILE)
-#define COMMENT #
-COMMENT Makefile for ruby $(OS)
+ @type << > $(MAKEFILE)
+### Makefile for ruby $(OS) ###
+srcdir = $(srcdir:\=/)
+<<
+ @cl -nologo -EP -I$(srcdir) <<"Creating $(MAKEFILE)" >> $(MAKEFILE)
#include "version.h"
MAJOR = RUBY_VERSION_MAJOR
MINOR = RUBY_VERSION_MINOR
TEENY = RUBY_VERSION_TEENY
-srcdir = $(srcdir:\=/)
<<
-generic-: nul