summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-04-23 15:43:26 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-04-23 15:43:26 +0000
commitad8dbab8887bccb5dc997071d5d11d3d36dd62b4 (patch)
tree7c3a0d03f513127f1a459940f7b99bb05aae2717
parent3fe3e72b17927276843f7ffee31f76d71d6f1645 (diff)
* ext/extmk.rb.in (create_makefile): use `{$(srcdir)}' directive instead
of `$(srcdir)/' when including depend file. * lib/mkmf.rb (create_makefile): add `{$(srcdir)}' when including depend file. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2398 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog8
-rw-r--r--ext/extmk.rb.in2
-rw-r--r--lib/mkmf.rb3
3 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b20564d0f3c..16831a8a35f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Wed Apr 24 00:37:12 2002 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * ext/extmk.rb.in (create_makefile): use `{$(srcdir)}' directive instead
+ of `$(srcdir)/' when including depend file.
+
+ * lib/mkmf.rb (create_makefile): add `{$(srcdir)}' when including depend
+ file.
+
Fri Apr 19 22:03:40 2002 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/Makefile.sub: add -DNT to $CFLAGS instead of $CPPFLAGS.
diff --git a/ext/extmk.rb.in b/ext/extmk.rb.in
index ed6a49fb7c8..9f587649ad0 100644
--- a/ext/extmk.rb.in
+++ b/ext/extmk.rb.in
@@ -586,7 +586,7 @@ $(DLLIB): $(OBJS)
mfile.printf "###\n"
while line = dfile.gets()
line.gsub!(/\.o\b/, ".#{$OBJEXT}")
- line.gsub!(/(\s)([^\s\/]+\.[ch])/, '\1$(srcdir)/\2') if /nmake/i =~ $make
+ line.gsub!(/(\s)([^\s\/]+\.[ch])/, '\1{$(srcdir)}\2') if /nmake/i =~ $make
mfile.printf "%s", line.gsub('\$\(hdrdir\)/config.h', '$(topdir)/config.h')
end
dfile.close
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index a4f7e588992..66f1f8a03f0 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -630,7 +630,8 @@ EOMF
dfile = open(depend, "r")
mfile.printf "###\n"
while line = dfile.gets()
- mfile.printf "%s", line.gsub(/\.o\b/, ".#{$OBJEXT}")
+ line.gsub!(/\.o\b/, ".#{$OBJEXT}")
+ mfile.printf "%s", line.gsub(/(\s)([^\s\/]+\.[ch])/, '\1{$(srcdir)}\2') if /nmake/i =~ $make
end
dfile.close
end