From 870c35b5f503656fdec56cc46928d8abb130ad40 Mon Sep 17 00:00:00 2001 From: jwise Date: Mon, 14 Jan 2002 15:19:46 +0000 Subject: Fix configure script gmake detection to be more resilient. --- www/ap-jserv/distinfo | 4 ++-- www/ap-jserv/patches/patch-aa | 24 +++++++++++++----------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/www/ap-jserv/distinfo b/www/ap-jserv/distinfo index aac27e4b625..c4bc80bb070 100644 --- a/www/ap-jserv/distinfo +++ b/www/ap-jserv/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.2 2001/04/20 12:02:32 skrll Exp $ +$NetBSD: distinfo,v 1.3 2002/01/14 15:19:46 jwise Exp $ SHA1 (ApacheJServ-1.1.2.tar.gz) = 0e1618a40785a6f34669b6b2ef6958b868f3e891 Size (ApacheJServ-1.1.2.tar.gz) = 770638 bytes -SHA1 (patch-aa) = 9e6c9c65880f1bdc1edf1acdda5e6a344c03dbfe +SHA1 (patch-aa) = 41e03fd458430e000629c5af29dcd42a1e366f2b SHA1 (patch-ab) = bd1de609f0ef106718718d3437151354c628e2ce SHA1 (patch-ac) = 8beb08182fdd3ae6fa35726479f4a23025a5a958 SHA1 (patch-ad) = 6fafae8e5ac3333967d4d5a6e63905c99f27362a diff --git a/www/ap-jserv/patches/patch-aa b/www/ap-jserv/patches/patch-aa index 3845627315a..15761ce7ca2 100644 --- a/www/ap-jserv/patches/patch-aa +++ b/www/ap-jserv/patches/patch-aa @@ -1,11 +1,13 @@ -$NetBSD: patch-aa,v 1.1.1.1 2000/01/14 20:59:02 jwise Exp $ ---- configure.orig Thu Jan 13 13:47:13 2000 -+++ configure Thu Jan 13 13:53:01 2000 -@@ -2517,6 +2517,7 @@ - - ifGNUmake='#' ; - _cv_gnu_make_command='' ; -+ MAKE=${LOCALBASE}/bin/gmake - if ${TEST} -x ${MAKE} ; then - if ( ${MAKE} --version 2> /dev/null | ${GREP} GNU ) ; then - _cv_gnu_make_command=${MAKE} ; +--- configure.orig Sat Jun 17 15:05:17 2000 ++++ configure Mon Jan 14 10:16:23 2002 +@@ -2439,8 +2439,8 @@ + else + echo "$ac_t""no" 1>&6 + fi +-# Extract the first word of "make", so it can be a program name with args. +-set dummy make; ac_word=$2 ++# Extract the first word of "gmake", so it can be a program name with args. ++set dummy gmake; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 + echo "configure:2446: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_MAKE'+set}'`\" = set"; then -- cgit v1.2.3