Prefer relative directory from srcdir to top_srcdir

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67073 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

8 files changed, 13 insertions, 11 deletions

diff --git a/ext/digest/bubblebabble/depend b/ext/digest/bubblebabble/depend
index 23d3c30159..a43313f142 100644
--- a/ext/digest/bubblebabble/depend
+++ b/ext/digest/bubblebabble/depend
@@ -9,6 +9,6 @@ bubblebabble.o: $(hdrdir)/ruby/missing.h
 bubblebabble.o: $(hdrdir)/ruby/ruby.h
 bubblebabble.o: $(hdrdir)/ruby/st.h
 bubblebabble.o: $(hdrdir)/ruby/subst.h
-bubblebabble.o: $(top_srcdir)/ext/digest/digest.h
+bubblebabble.o: $(srcdir)/../digest.h
 bubblebabble.o: bubblebabble.c
 # AUTOGENERATED DEPENDENCIES END
diff --git a/ext/digest/md5/depend b/ext/digest/md5/depend
index 4342fa1ed5..d43101d1f1 100644
--- a/ext/digest/md5/depend
+++ b/ext/digest/md5/depend
@@ -12,7 +12,7 @@ md5init.o: $(hdrdir)/ruby/missing.h
 md5init.o: $(hdrdir)/ruby/ruby.h
 md5init.o: $(hdrdir)/ruby/st.h
 md5init.o: $(hdrdir)/ruby/subst.h
-md5init.o: $(top_srcdir)/ext/digest/digest.h
+md5init.o: $(srcdir)/../digest.h
 md5init.o: md5init.c
 md5init.o: md5ossl.h
 # AUTOGENERATED DEPENDENCIES END
diff --git a/ext/digest/rmd160/depend b/ext/digest/rmd160/depend
index f75deb58b3..4582922cf0 100644
--- a/ext/digest/rmd160/depend
+++ b/ext/digest/rmd160/depend
@@ -12,7 +12,7 @@ rmd160init.o: $(hdrdir)/ruby/missing.h
 rmd160init.o: $(hdrdir)/ruby/ruby.h
 rmd160init.o: $(hdrdir)/ruby/st.h
 rmd160init.o: $(hdrdir)/ruby/subst.h
-rmd160init.o: $(top_srcdir)/ext/digest/digest.h
+rmd160init.o: $(srcdir)/../digest.h
 rmd160init.o: rmd160init.c
 rmd160init.o: rmd160ossl.h
 # AUTOGENERATED DEPENDENCIES END
diff --git a/ext/digest/sha1/depend b/ext/digest/sha1/depend
index 772cf6e00a..c89f99f547 100644
--- a/ext/digest/sha1/depend
+++ b/ext/digest/sha1/depend
@@ -12,7 +12,7 @@ sha1init.o: $(hdrdir)/ruby/missing.h
 sha1init.o: $(hdrdir)/ruby/ruby.h
 sha1init.o: $(hdrdir)/ruby/st.h
 sha1init.o: $(hdrdir)/ruby/subst.h
-sha1init.o: $(top_srcdir)/ext/digest/digest.h
+sha1init.o: $(srcdir)/../digest.h
 sha1init.o: sha1init.c
 sha1init.o: sha1ossl.h
 # AUTOGENERATED DEPENDENCIES END
diff --git a/ext/digest/sha2/depend b/ext/digest/sha2/depend
index 513878b1ed..42453269ea 100644
--- a/ext/digest/sha2/depend
+++ b/ext/digest/sha2/depend
@@ -12,7 +12,7 @@ sha2init.o: $(hdrdir)/ruby/missing.h
 sha2init.o: $(hdrdir)/ruby/ruby.h
 sha2init.o: $(hdrdir)/ruby/st.h
 sha2init.o: $(hdrdir)/ruby/subst.h
-sha2init.o: $(top_srcdir)/ext/digest/digest.h
+sha2init.o: $(srcdir)/../digest.h
 sha2init.o: sha2init.c
 sha2init.o: sha2ossl.h
 # AUTOGENERATED DEPENDENCIES END
diff --git a/ext/json/generator/depend b/ext/json/generator/depend
index c144ec0850..3621948f28 100644
--- a/ext/json/generator/depend
+++ b/ext/json/generator/depend
@@ -17,7 +17,7 @@ generator.o: $(hdrdir)/ruby/regex.h
 generator.o: $(hdrdir)/ruby/ruby.h
 generator.o: $(hdrdir)/ruby/st.h
 generator.o: $(hdrdir)/ruby/subst.h
-generator.o: $(top_srcdir)/ext/json/fbuffer/fbuffer.h
+generator.o: $(srcdir)/../fbuffer/fbuffer.h
 generator.o: generator.c
 generator.o: generator.h
 # AUTOGENERATED DEPENDENCIES END
diff --git a/ext/json/parser/depend b/ext/json/parser/depend
index 8463a93c3b..de97409488 100644
--- a/ext/json/parser/depend
+++ b/ext/json/parser/depend
@@ -15,7 +15,7 @@ parser.o: $(hdrdir)/ruby/oniguruma.h
 parser.o: $(hdrdir)/ruby/ruby.h
 parser.o: $(hdrdir)/ruby/st.h
 parser.o: $(hdrdir)/ruby/subst.h
-parser.o: $(top_srcdir)/ext/json/fbuffer/fbuffer.h
+parser.o: $(srcdir)/../fbuffer/fbuffer.h
 parser.o: parser.c
 parser.o: parser.h
 parser.o: parser.rl
diff --git a/tool/update-deps b/tool/update-deps
index 9a200bf4da..4aaf812430 100755
--- a/tool/update-deps
+++ b/tool/update-deps
@@ -211,8 +211,9 @@ def in_makefile(target, source)
     end
     ["enc/depend", target2, source2]
   when %r{\Aext/}
-    unless File.exist?("#{File.dirname(target)}/extconf.rb")
-      warn "warning: not found: #{File.dirname(target)}/extconf.rb"
+    targetdir = File.dirname(target)
+    unless File.exist?("#{targetdir}/extconf.rb")
+      warn "warning: not found: #{targetdir}/extconf.rb"
     end
     target2 = File.basename(target)
     relpath = Pathname(source).relative_path_from(Pathname(target).dirname).to_s
@@ -224,8 +225,9 @@ def in_makefile(target, source)
     when *FILES_SAME_NAME_TOP then source2 = "$(top_srcdir)/#{source}"
     when %r{\A\.ext/include/[^/]+/ruby/} then source2 = "$(arch_hdrdir)/ruby/#{$'}"
     when %r{\Ainclude/} then source2 = "$(hdrdir)/#{$'}"
-    when %r{\A#{Regexp.escape File.dirname(target)}/extconf\.h\z} then source2 = "$(RUBY_EXTCONF_H)"
-    when %r{\A#{Regexp.escape File.dirname(target)}/} then source2 = $'
+    when %r{\A#{Regexp.escape targetdir}/extconf\.h\z} then source2 = "$(RUBY_EXTCONF_H)"
+    when %r{\A#{Regexp.escape targetdir}/} then source2 = $'
+    when %r{\A#{Regexp.escape File.dirname(targetdir)}/} then source2 = "$(srcdir)/../#{$'}"
     else source2 = "$(top_srcdir)/#{source}"
     end
     ["#{File.dirname(target)}/depend", target2, source2]