diff --git a/ChangeLog b/ChangeLog index 6ce5bd107a..d4037e5933 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:49:02 2006 Tadayoshi Funaba * 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