set RUBY=${RUBY} in the environment rather than patching configure.

ok jeremy@
This commit is contained in:
sthen 2010-10-29 12:45:45 +00:00
parent 65924af12e
commit 0f513e63f8
2 changed files with 4 additions and 14 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.55 2010/10/28 13:39:35 jeremy Exp $
# $OpenBSD: Makefile,v 1.56 2010/10/29 12:45:45 sthen Exp $
SHARED_ONLY= Yes
@ -52,7 +52,9 @@ CPPFLAGS+= -I${LOCALBASE}/include/libart-2.0 \
-I${X11BASE}/include/ \
-I${X11BASE}/include/freetype2
LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" \
LDFLAGS="${LDFLAGS}" \
RUBY="${RUBY}"
WANTLIB-main= c m z freetype
LIB_DEPENDS-main= png::graphics/png \

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-configure,v 1.6 2010/09/23 22:13:26 jeremy Exp $
--- configure.orig Mon Sep 13 13:03:32 2010
+++ configure Mon Sep 13 13:04:46 2010
@@ -28654,7 +28654,7 @@ fi
# Extract the first word of "ruby", so it can be a program name with args.
-set dummy ruby; ac_word=$2
+set dummy ruby18; ac_word=$2
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_RUBY+set}" = set; then