[DRE-commits] [ruby-gnome2] 03/09: check existence of Makefile before running make

[Daisuke Higuchi]

This is an automated email from the git hooks/post-receive script.

dai pushed a commit to branch master
in repository ruby-gnome2.

commit 3b4bdfa37ded7848a771876fd21f128b6b66888c
Author: HIGUCHI Daisuke (VDR dai) <dai at debian.org>
Date:   Sat Jul 22 01:27:13 2017 +0900

    check existence of Makefile before running make
---
 .../patches/check-exist-makefile-before-make.patch | 45 ++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/debian/patches/check-exist-makefile-before-make.patch b/debian/patches/check-exist-makefile-before-make.patch
new file mode 100644
index 0000000..c7f519f
--- /dev/null
+++ b/debian/patches/check-exist-makefile-before-make.patch
@@ -0,0 +1,45 @@
+Description: check existence of Makefile before running make
+Author: HIGUCHI Daisuke (VDR dai) <dai at debian.org>
+Forwarded: https://github.com/ruby-gnome2/ruby-gnome2/pull/1065
+Applied-Upstream: 3.1.8+, https://github.com/ruby-gnome2/ruby-gnome2/pull/1065/commits/35cb46ea9bfed1aa7df9eb143942126a52728672
+Last-Update: 2017-07-20
+
+Index: ruby-gnome2/cairo-gobject/test/run-test.rb
+===================================================================
+--- ruby-gnome2.orig/cairo-gobject/test/run-test.rb
++++ ruby-gnome2/cairo-gobject/test/run-test.rb
+@@ -29,7 +29,7 @@ modules = [
+   [cairo_gobject_base, "cairo-gobject"],
+ ]
+ modules.each do |target, module_name|
+-  if system("which make > /dev/null")
++  if File.exist?("#{target}/Makefile") and system("which make > /dev/null")
+     `make -C #{target.dump} > /dev/null` or exit(false)
+   end
+   $LOAD_PATH.unshift(File.join(target, "ext", module_name))
+Index: ruby-gnome2/glib2/test/run-test.rb
+===================================================================
+--- ruby-gnome2.orig/glib2/test/run-test.rb
++++ ruby-gnome2/glib2/test/run-test.rb
+@@ -22,7 +22,7 @@ top = File.expand_path(File.join(base, "
+ $LOAD_PATH.unshift(top)
+ require 'test/glib-test-init'
+ 
+-if system("which make > /dev/null")
++if File.exist?("#{top}/Makefile") and system("which make > /dev/null")
+   system("cd #{top.dump} && make > /dev/null") or exit(1)
+ end
+ 
+Index: ruby-gnome2/gobject-introspection/test/run-test.rb
+===================================================================
+--- ruby-gnome2.orig/gobject-introspection/test/run-test.rb
++++ ruby-gnome2/gobject-introspection/test/run-test.rb
+@@ -27,7 +27,7 @@ modules = [
+   [gobject_introspection_base, "gobject-introspection"]
+ ]
+ modules.each do |target, module_name|
+-  if system("which make > /dev/null")
++  if File.exist?("#{target}/Makefile") and system("which make > /dev/null")
+     `make -C #{target.dump} > /dev/null` or exit(false)
+   end
+   $LOAD_PATH.unshift(File.join(target, "ext", module_name))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-gnome2.git