diff options
| author | jlam <jlam@pkgsrc.org> | 2005-04-28 23:42:48 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2005-04-28 23:42:48 +0000 |
| commit | cde305aa358f012639bbe31d1d3f60b11980d739 (patch) | |
| tree | 4ff55f62620e1307dcdef0fc6c8c8dbce7b53cf7 /x11 | |
| parent | 9a8c8d4cae70d1c3e76b36510b6bb6be940c1e0e (diff) | |
| download | pkgsrc-cde305aa358f012639bbe31d1d3f60b11980d739.tar.gz | |
Use :sh instead of != to defer execution of ${PERL} until the configure
phase. This avoids needing ${PERL} in the top-level make.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/xscreensaver/Makefile.common | 11 |
1 files changed, 6 insertions, 5 deletions
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) |