Skip to content

Commit

Permalink
bcc32/configure.bat : Control of a message.
Browse files Browse the repository at this point in the history
bcc32/makefile.sub  : @(sitearch) typo.
ext/extmk.rb.in     : [bccwin32] libdir is added to a library path.
lib/mkmf.rb         : ditto.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@2818 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
H_Konishi authored and H_Konishi committed Sep 8, 2002
1 parent 5f60b44 commit fe0079c
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 4 deletions.
7 changes: 7 additions & 0 deletions 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
Expand Down
2 changes: 1 addition & 1 deletion bcc32/Makefile.sub
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion bcc32/configure.bat
Expand Up @@ -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
2 changes: 1 addition & 1 deletion ext/extmk.rb.in
Expand Up @@ -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" +
Expand Down
2 changes: 1 addition & 1 deletion lib/mkmf.rb
Expand Up @@ -597,7 +597,7 @@ def create_makefile(target, srcprefix = nil)
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" +
Expand Down

0 comments on commit fe0079c

Please sign in to comment.