From 5fe3c2e3efb49b0f0d471a53285ae4c6c5719aa0 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 13 Oct 2006 15:56:48 +0000 Subject: * 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 --- ChangeLog | 7 +++++++ bcc32/Makefile.sub | 15 ++++++++++++--- bcc32/configure.bat | 4 ++-- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 67aa8b05b7..22bc9669b7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Sat Oct 14 00:55:08 2006 Nobuyoshi Nakada + + * 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 * lib/date.rb: updated based on date2 3.9.5. diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub index ad463e44ac..59806abffa 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 123a3f23c8..143ad947f0 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 -- cgit v1.2.3