[Pkg-opt-media-team] [dvdisaster] 03/61: Fix GNU Make detection.

[Takaki Taniguchi]

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

takaki pushed a commit to branch master
in repository dvdisaster.

commit f754ce107523dac3729005ddb6c230ea10b5022c
Author: Carlos Maddela <e7appew at gmail.com>
Date:   Sun Dec 18 23:25:52 2016 +1100

    Fix GNU Make detection.
    
    Closes: #848811
---
 debian/patches/08-fix-gnu-make-detection.patch | 42 ++++++++++++++++++++++++++
 debian/patches/series                          |  1 +
 2 files changed, 43 insertions(+)

diff --git a/debian/patches/08-fix-gnu-make-detection.patch b/debian/patches/08-fix-gnu-make-detection.patch
new file mode 100644
index 0000000..60f4ab2
--- /dev/null
+++ b/debian/patches/08-fix-gnu-make-detection.patch
@@ -0,0 +1,42 @@
+From: Carlos Maddela <e7appew at gmail.com>
+Date: Sun, 18 Dec 2016 23:05:03 +1100
+Subject: Fix GNU Make detection.
+
+Description: Fix GNU Make detection.
+ While the previous code works with earlier versions of bash, it doesn't
+ seem to work with bash 4.4.5. The redirection to /dev/null somehow causes
+ grep to return an error code of 2.
+ .
+ This change allows for more predictable behaviour: grep returns an
+ error code of 0 or 1.
+Author: Carlos Maddela <e7appew at gmail.com>
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/848811
+Forwarded: no
+Last-Update: 2016-12-18
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ scripts/bash-based-configure | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/scripts/bash-based-configure b/scripts/bash-based-configure
+index f9d80c8..ffb5919 100644
+--- a/scripts/bash-based-configure
++++ b/scripts/bash-based-configure
+@@ -309,13 +309,13 @@ function REQUIRE_GMAKE()
+ 
+    echo -n "Checking for gmake: "
+ 
+-   if (gmake -v | grep "GNU Make") > /dev/null 2>&1 ;
++   if (gmake -v 2>&1 | grep "GNU Make") > /dev/null 2>&1 ;
+      then echo "yes"
+ 	  echo "MAKE = `which gmake`" >>Makefile.config
+ 	  return 0
+    fi;
+ 
+-   if (make -v | grep "GNU Make") > /dev/null 2>&1 ;
++   if (make -v 2>&1 | grep "GNU Make") > /dev/null 2>&1 ;
+      then echo "yes"
+ 	  echo "MAKE = `which make`" >>Makefile.config
+ 	  return 0
diff --git a/debian/patches/series b/debian/patches/series
index a96b61d..7c48a2d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 05-help-dialog.patch
 06-remove-encoding-from-desktop-file.patch
 07-fix-spelling-errors-in-binaries.patch
+08-fix-gnu-make-detection.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opt-media/dvdisaster.git