summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-10-13 15:56:48 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-10-13 15:56:48 +0000
commit5fe3c2e3efb49b0f0d471a53285ae4c6c5719aa0 (patch)
tree29c414329b302ae702f955c18c2ea32f68c5e46d
parent1fe57477ac27db63c6cdb52828a722022b630a3c (diff)
* bcc32/Makefile.sub (post-install-ext): no longer needed.
* bcc32/configure.bat: get rid of a quirk of Borland make, which sets empty macro in command line to "1". git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@11162 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--bcc32/Makefile.sub15
-rw-r--r--bcc32/configure.bat4
3 files changed, 21 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 67aa8b0..22bc966 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sat Oct 14 00:55:08 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * bcc32/Makefile.sub (post-install-ext): no longer needed.
+
+ * bcc32/configure.bat: get rid of a quirk of Borland make, which
+ sets empty macro in command line to "1".
+
Fri Oct 13 22:50:43 2006 Tadayoshi Funaba <tadf@dotrb.org>
* lib/date.rb: updated based on date2 3.9.5.
diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub
index ad463e4..59806ab 100644
--- a/bcc32/Makefile.sub
+++ b/bcc32/Makefile.sub
@@ -434,9 +434,18 @@ $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: rbconfig.rb
-so_name=$(RUBY_SO_NAME) \
. $(icondirs) $(srcdir)win32
-post-install-ext::
- $(MINIRUBY) -I$(srcdir)lib -rrbconfig -rfileutils \
- -e "FileUtils.rm_f(Dir[ARGV[0]+Config::CONFIG['archdir']+'/**/*.tds'])" "$(DESTDIR:\=/)"
+post-install-bin::
+ @exit > $@
+post-install-lib::
+ @exit > $@
+post-install-ext-comm::
+ @exit > $@
+post-install-ext-arch::
+ @exit > $@
+post-install-man::
+ @exit > $@
+post-install-doc::
+ @exit > $@
clean-local::
@$(RM) ext\extinit.c ext\extinit.$(OBJEXT) *.tds *.il? $(RUBY_SO_NAME).lib
diff --git a/bcc32/configure.bat b/bcc32/configure.bat
index 123a3f2..143ad94 100644
--- a/bcc32/configure.bat
+++ b/bcc32/configure.bat
@@ -69,7 +69,7 @@ goto :loop
shift
goto :loop
:extout
- echo>> ~tmp~.mak "EXTOUT=%2" \
+ echo>> ~tmp~.mak -D"EXTOUT=%2" \
shift
shift
goto :loop
@@ -87,6 +87,6 @@ goto :loop
del ~tmp~.mak
goto :exit
:end
-echo>> ~tmp~.mak bcc32dir="$(@D)"
+echo>> ~tmp~.mak -Dbcc32dir="$(@D)"
make -s -f ~tmp~.mak
:exit