diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-10-13 15:56:48 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-10-13 15:56:48 +0000 |
| commit | 5a82e540790870f33e1120aa9396b67d6d4382df (patch) | |
| tree | 86c2dbfc479f1920691f641f987d1906dd4851e3 | |
| parent | 17435a4e5a9beb3f5c3ae16e7587c08f5fc3c3f9 (diff) | |
| download | ruby-5a82e540790870f33e1120aa9396b67d6d4382df.tar.gz | |
* 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/trunk@11162 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | bcc32/Makefile.sub | 15 | ||||
| -rw-r--r-- | bcc32/configure.bat | 4 |
3 files changed, 21 insertions, 5 deletions
@@ -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:49:02 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 c7d3a794f8..7398e2803e 100644 --- a/bcc32/Makefile.sub +++ b/bcc32/Makefile.sub @@ -445,9 +445,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]+RbConfig::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 c1b3cdb64c..6e3056ff38 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
|