From 16b534153a81a8df033ca7f7f9ef241818c98784 Mon Sep 17 00:00:00 2001
From: bouyer <bouyer>
Date: Sun, 27 Oct 2002 13:34:59 +0000
Subject: Use ${MAKE-make} instead of $ac_make in configure. If ${MAKE} is a
 full path (e.g. /usr/local/bin/gmake) $ac_make will have / changed to _ (e.g.
 _usr_local_bin_gamke)

---
 x11/gtk--/distinfo         |  4 +++-
 x11/gtk--/patches/patch-ai | 13 +++++++++++++
 x11/gtk--/patches/patch-aj | 13 +++++++++++++
 3 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 x11/gtk--/patches/patch-ai
 create mode 100644 x11/gtk--/patches/patch-aj

diff --git a/x11/gtk--/distinfo b/x11/gtk--/distinfo
index 5f9c3457708..388b3586c12 100644
--- a/x11/gtk--/distinfo
+++ b/x11/gtk--/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.5 2002/09/11 21:53:48 wiz Exp $
+$NetBSD: distinfo,v 1.6 2002/10/27 13:34:59 bouyer Exp $
 
 SHA1 (gtkmm-1.2.10.tar.gz) = fb220aa8bdb609b7ead42fac1afbbbf57031fb2a
 Size (gtkmm-1.2.10.tar.gz) = 716700 bytes
 SHA1 (patch-aa) = f23a20f6fa3912d9d1a743363de0fcaf8c69818d
 SHA1 (patch-ag) = de2719b25d41927b52f2de7bf5ee1a4720c34e26
 SHA1 (patch-ah) = 5bd15cf450b81c6bc6f73e9f5f0ccd1700e5c626
+SHA1 (patch-ai) = d9c3a26edf0dd0baca519b5477f09ba267fbebd5
+SHA1 (patch-aj) = 805f2ce57858b61cba7c01a21ccd03e7426a30c5
diff --git a/x11/gtk--/patches/patch-ai b/x11/gtk--/patches/patch-ai
new file mode 100644
index 00000000000..d052467980d
--- /dev/null
+++ b/x11/gtk--/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2002/10/27 13:35:00 bouyer Exp $
+
+--- configure.in.orig	Wed Oct 23 16:27:18 2002
++++ configure.in	Wed Oct 23 16:27:35 2002
+@@ -131,7 +131,7 @@
+ dnl Check for GNU make (stolen from gtk+/configure.in)
+ dnl 
+ AC_MSG_CHECKING(whether make is GNU Make)
+-if $ac_make --version 2>/dev/null | grep '^GNU Make ' >/dev/null ; then
++if ${MAKE-make} --version 2>/dev/null | grep '^GNU Make ' >/dev/null ; then
+ 	AC_MSG_RESULT(yes)
+ else
+ 	AC_MSG_RESULT(no)
diff --git a/x11/gtk--/patches/patch-aj b/x11/gtk--/patches/patch-aj
new file mode 100644
index 00000000000..1bf4db0dd85
--- /dev/null
+++ b/x11/gtk--/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1 2002/10/27 13:35:00 bouyer Exp $
+
+--- configure.orig	Wed Oct 23 16:27:42 2002
++++ configure	Wed Oct 23 16:28:02 2002
+@@ -5585,7 +5585,7 @@
+ 
+ echo $ac_n "checking whether make is GNU Make""... $ac_c" 1>&6
+ echo "configure:5588: checking whether make is GNU Make" >&5
+-if $ac_make --version 2>/dev/null | grep '^GNU Make ' >/dev/null ; then
++if ${MAKE-make} --version 2>/dev/null | grep '^GNU Make ' >/dev/null ; then
+ 	echo "$ac_t""yes" 1>&6
+ else
+ 	echo "$ac_t""no" 1>&6
-- 
cgit v1.2.3