From cde305aa358f012639bbe31d1d3f60b11980d739 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Thu, 28 Apr 2005 23:42:48 +0000
Subject: Use :sh instead of != to defer execution of ${PERL} until the
 configure phase.  This avoids needing ${PERL} in the top-level make.

---
 x11/xscreensaver/Makefile.common | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'x11/xscreensaver')

diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common
index a48f92ab94c..7773cf0d310 100644
--- a/x11/xscreensaver/Makefile.common
+++ b/x11/xscreensaver/Makefile.common
@@ -29,7 +29,7 @@ CONFIGURE_ARGS+=	--without-pam
 
 CONFIGURE_ENV+=		X_PRE_LIBS=-lXt
 CONFIGURE_ENV+=		ac_cv_x_app_defaults="${PREFIX}/lib/X11/app-defaults"
-CONFIGURE_ENV+=		PERL="${PERL5}" ac_cv_perl_version="${PERL_VERSION}"
+CONFIGURE_ENV+=		PERL="${PERL5}" ac_cv_perl_version="${PERL_VERSION_cmd:sh}"
 CONFIGURE_ENV+=		INTLTOOL_PERL="${PERL5}"
 .if defined(PKGREVISION)
 CONFIGURE_ENV+=		X_CFLAGS="-DPKGREVISION=${PKGREVISION}"
@@ -42,10 +42,11 @@ PATCHDIR=		${.CURDIR}/../../x11/xscreensaver/patches
 
 .include "../../mk/bsd.prefs.mk"
 
-.ifndef (PERL_VERSION)
-PERL_VERSION!=		if [ -x ${PERL5} ]; then ${PERL5} -e 'print $$]'; else ${ECHO} "5.006"; fi
-MAKEFLAGS+=		PERL_VERSION=${PERL_VERSION}
-.endif
+PERL_VERSION_cmd=	if ${TEST} -x ${PERL5}; then			\
+				${PERL5} -e 'print $$]';		\
+			else						\
+				${ECHO} "5.006";			\
+			fi
 
 .if (${OPSYS} == "NetBSD")
 .  if defined(KERBEROS)
-- 
cgit v1.2.3