diff --git a/ChangeLog b/ChangeLog index f905ac5a5a..dbd1db2d27 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Wed Jul 15 16:29:35 2009 NAKAMURA Usaku + + * win32/Makefile.sub (LIBPATHFLAG): path is already quoted in mkmf.rb. + Wed Jul 15 06:21:50 2009 Hidetoshi NAGAI * ext/tk/extconf.rb: --with-{tcl,tk}-dir doesn't work.[ruby-dev:38782] diff --git a/win32/Makefile.sub b/win32/Makefile.sub index c9d458220d..03e5d97c91 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -666,7 +666,7 @@ s,@BASERUBY@,$(BASERUBY),;t t s,@OUTFLAG@,$(OUTFLAG),;t t s,@COUTFLAG@,$(COUTFLAG),;t t s,@CPPOUTFILE@,-P,;t t -s,@LIBPATHFLAG@, -libpath:"%s",;t t +s,@LIBPATHFLAG@, -libpath:%s,;t t s,@RPATHFLAG@,,;t t s,@LIBARG@,%s.lib,;t t s,@LINK_SO@,$$(LDSHARED) -Fe$$(@) $$(OBJS) $$(LIBS) $$(LOCAL_LIBS) -link $$(DLDFLAGS) -implib:$$(*F:.so=)-$$(arch).lib -pdb:$$(*F:.so=)-$$(arch).pdb -def:$$(DEFFILE),;t t