summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH_Konishi <H_Konishi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-09-08 05:46:29 +0000
committerH_Konishi <H_Konishi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-09-08 05:46:29 +0000
commit275d1a12e6eeae346731bd9373aeff934d270db0 (patch)
treecea47e12b403f103e2081ca9cfe7fbec504787ed
parent75821a5afba9c19a3eedeb4a092aade1ad21209a (diff)
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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2818 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--bcc32/Makefile.sub2
-rw-r--r--bcc32/configure.bat2
-rw-r--r--ext/extmk.rb.in2
-rw-r--r--lib/mkmf.rb2
5 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 02bab317d90..b91c3456374 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 517dc198577..31b92360631 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 0025fa685e8..65b53a2978e 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 77da315df4a..593ee3748fa 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 1ded99483bf..ff00be24518 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" +