diff --git a/ChangeLog b/ChangeLog
index e61ba0d0a6..3ebfb3c89a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Sat Jan 10 23:01:41 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (LIBPATHFLAG, RPATHFLAG): enclose paths with single
+	  quotes.  [ruby-dev:22564]
+
+	* lib/mkmf.rb (libpathflag): do not enclose with quotes always.
+
+	* {bcc32,win32,wince}/Makefile.sub (LIBPATHFLAG): quoted.
+
 Sat Jan 10 22:46:18 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* dir.c (dir_inspect): new method, Dir#inspect.  [ruby-dev:22562]
diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub
index 537dc14e94..09f5a029f2 100644
--- a/bcc32/Makefile.sub
+++ b/bcc32/Makefile.sub
@@ -380,10 +380,10 @@ s,@DLDLIBS@,$(DLDLIBS),;t t
 s,@ENABLE_SHARED@,yes,;t t
 s,@OUTFLAG@,-o,;t t
 s,@CPPOUTFILE@,,;t t
-s,@LIBPATHFLAG@, -L%s,;t t
+s,@LIBPATHFLAG@, -L"%s",;t t
 s,@RPATHFLAG@,,;t t
 s,@LIBARG@,%s.lib,;t t
-s,@LINK_SO@,$$(LDSHARED) $$(DLDFLAGS) $$(LIBPATH) $$(OBJS), $$@, nul, $$(LIBS) $$(LOCAL_LIBS), $$(DEFFILE), $$(RESFILE),;t t
+s,@LINK_SO@,$$(LDSHARED) $$(DLDFLAGS) $$(LIBPATH) $$(OBJS), $$(@:/=\), nul, $$(LIBS) $$(LOCAL_LIBS), $$(DEFFILE), $$(RESFILE),;t t
 s,@COMPILE_C@,$$(CC) $$(CFLAGS) $$(CPPFLAGS) -c $$(<:/=\),;t t
 s,@COMPILE_CXX@,$$(CXX) $$(CXXFLAGS) $$(CPPFLAGS) -P -c $$(<:/=\),;t t
 s,@COMPILE_RULES@,{$$(srcdir)}.%s{}.%s: .%s.%s:,;t t
diff --git a/configure.in b/configure.in
index 3c07c4e402..9a2416c75c 100644
--- a/configure.in
+++ b/configure.in
@@ -799,7 +799,7 @@ AC_SUBST(DLEXT2)dnl
 AC_SUBST(LIBEXT)dnl
 
 STATIC=
-: ${LIBPATHFLAG=' -L%s'}
+: ${LIBPATHFLAG=" -L'%s'"}
 : ${PATHFLAG=''}
 
 if test "$with_dln_a_out" != yes; then
@@ -873,8 +873,8 @@ if test "$with_dln_a_out" != yes; then
 	netbsd*)	: ${LDSHARED='${CC} -shared'}
 			if test "$rb_cv_binary_elf" = yes; then
 			    LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
-			    LIBPATHFLAG=' -L%1$-s'
-			    RPATHFLAG=' -Wl,-R%1$-s'
+			    LIBPATHFLAG=" -L'%1\$-s'"
+			    RPATHFLAG=" -Wl,-R'%1\$-s'"
 			fi
 			rb_cv_dlopen=yes ;;
 	openbsd*) 	: ${LDSHARED="\$(CC) -shared ${CCDLFLAGS}"}
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index ab1bea1b59..fb62c271ea 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -249,7 +249,7 @@ end
 
 def libpathflag(libpath=$LIBPATH)
   libpath.map{|x|
-    (x == "$(topdir)" ? LIBPATHFLAG : LIBPATHFLAG+RPATHFLAG) % %['#{x}']
+    (x == "$(topdir)" ? LIBPATHFLAG : LIBPATHFLAG+RPATHFLAG) % x
   }.join
 end
 
@@ -1036,7 +1036,7 @@ LINK_SO = config_string('LINK_SO') ||
     "$(LDSHARED) $(DLDFLAGS) $(LIBPATH) #{OUTFLAG}$(DLLIB) " \
     "$(OBJS) $(LOCAL_LIBS) $(LIBS)"
   end
-LIBPATHFLAG = config_string('LIBPATHFLAG') || ' -L%s'
+LIBPATHFLAG = config_string('LIBPATHFLAG') || " -L'%s'"
 RPATHFLAG = config_string('RPATHFLAG') || ''
 LIBARG = config_string('LIBARG') || '-l%s'
 
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index e9fb463f9f..4c12dadb88 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -376,7 +376,7 @@ s,@DLDLIBS@,$(DLDLIBS),;t t
 s,@ENABLE_SHARED@,yes,;t t
 s,@OUTFLAG@,-Fe,;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) $$(DLDFLAGS),;t t
diff --git a/wince/Makefile.sub b/wince/Makefile.sub
index fe084de39f..0406f643fd 100644
--- a/wince/Makefile.sub
+++ b/wince/Makefile.sub
@@ -411,7 +411,7 @@ s,@DLDLIBS@,$(DLDLIBS),;t t
 s,@ENABLE_SHARED@,yes,;t t
 s,@OUTFLAG@,-Fe,;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) $$(DLDFLAGS),;t t