diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | bcc32/Makefile.sub | 2 | ||||
| -rw-r--r-- | bcc32/configure.bat | 2 | ||||
| -rw-r--r-- | ext/extmk.rb.in | 2 | ||||
| -rw-r--r-- | lib/mkmf.rb | 2 |
5 files changed, 11 insertions, 4 deletions
@@ -1,3 +1,10 @@ +Sun Sep 8 14:36:40 2002 KONISHI Hiromasa <konishih@fd6.so-net.ne.jp> + + * bcc32/configure.bat : Control of a message. + * bcc32/makefile.sub : @(sitearch) typo. + * ext/extmk.rb.in : [bccwin32] libdir is added to a library path. + * lib/mkmf.rb : ditto. + Sat Sep 7 23:32:56 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net> * misc/inf-ruby.el (inferior-ruby-error-regexp-alist): regexp diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub index 517dc19857..31b9236063 100644 --- a/bcc32/Makefile.sub +++ b/bcc32/Makefile.sub @@ -337,7 +337,7 @@ s,@SOLIBS@,$(SOLIBS),;t t s,@DLDLIBS@,$(DLDLIBS),;t t s,@ENABLE_SHARED@,yes,;t t s,@arch@,$(ARCH)-$(OS),;t t -s,@sitearch@,$(ARCH)-$(RT),;t t +s,@sitearch@,$(ARCH)-$(OS),;t t s,@sitedir@,$${prefix}/lib/ruby/site_ruby,;t t s,@configure_args@,--enable-shared $(configure_args),;t t s,@configure_input@,$$configure_input,;t t diff --git a/bcc32/configure.bat b/bcc32/configure.bat index 0025fa685e..65b53a2978 100644 --- a/bcc32/configure.bat +++ b/bcc32/configure.bat @@ -8,4 +8,4 @@ echo>> ~tmp~.mak conf = %0 echo>> ~tmp~.mak $(conf:\=/): nul
echo>> ~tmp~.mak @del ~tmp~.mak
echo>> ~tmp~.mak make -Dbcc32dir="$(@D)" -f$(@D)/setup.mak %1
-make -f ~tmp~.mak
+make -s -f ~tmp~.mak
diff --git a/ext/extmk.rb.in b/ext/extmk.rb.in index 77da315df4..593ee3748f 100644 --- a/ext/extmk.rb.in +++ b/ext/extmk.rb.in @@ -117,7 +117,7 @@ CFLAGS = %s #{CFLAGS} #$CFLAGS CPPFLAGS = -I$(topdir) -I$(hdrdir) %s #$CPPFLAGS #{ if /bccwin32/ =~ RUBY_PLATFORM - "DLDFLAGS = #$LDFLAGS -L" + '"$(topdir:/=\\)"' + "\n" + + "DLDFLAGS = #$LDFLAGS -L" + '"$(libdir:/=\\);$(topdir:/=\\)"' + "\n" + "LDSHARED = #{CONFIG['LDSHARED']}\n" else "DLDFLAGS = #$DLDFLAGS #$LDFLAGS\n" + diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 1ded99483b..ff00be2451 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -597,7 +597,7 @@ CPPFLAGS = -I. -I$(hdrdir) -I$(srcdir) #{$defs.join(" ")} #{CONFIG["CPPFLAGS"]} CXXFLAGS = $(CFLAGS) #{ if /bccwin32/ =~ RUBY_PLATFORM - "DLDFLAGS = #$LDFLAGS -L\"$(topdir:/=\\)\"\n" + + "DLDFLAGS = #$LDFLAGS -L\"$(libdir:/=\\);$(topdir:/=\\)\"\n" + "LDSHARED = #{CONFIG['LDSHARED']}\n" else "DLDFLAGS = #{$DLDFLAGS} #{$LDFLAGS}\n" + |