summaryrefslogtreecommitdiff
path: root/security/openssh
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2000-09-05 09:43:02 +0000
committerjlam <jlam@pkgsrc.org>2000-09-05 09:43:02 +0000
commitd3f68d76caf543703b71ab26f8336b1cdcaab613 (patch)
tree39765f4f76759c7130a75843eda9ca5cac8ed2e9 /security/openssh
parent60d8d28f10ee39d258606553f4bfa85dc8ce80da (diff)
downloadpkgsrc-d3f68d76caf543703b71ab26f8336b1cdcaab613.tar.gz
The ssh-askpass program is in ${X11BASE}/bin or ${X11PREFIX}/bin depending
on whether it's part of the X11 distribution or installed from pkgsrc. Use correct path depending on if ${X11BASE}/bin/ssh-askpass exists.
Diffstat (limited to 'security/openssh')
-rw-r--r--security/openssh/Makefile12
1 files changed, 8 insertions, 4 deletions
diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index 9dcde79b1bf..7c78ea25d0b 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2000/09/05 09:33:16 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2000/09/05 09:43:02 jlam Exp $
#
DISTNAME= openssh-2.2.0p1
@@ -66,11 +66,15 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --sysconfdir=${SSH_CONF_DIR}
CONFIGURE_ARGS+= --with-ssl-dir=${SSLBASE}
-# The ssh-askpass program (security/ssh-askpass) is in ${X11BASE}/bin or
-# ${LOCALBASE}/bin depending on if xpkgwedge is installed. Do the safe thing
-# and assume it's in ${X11PREFIX}/bin.
+# The ssh-askpass program is in ${X11BASE}/bin or ${X11PREFIX}/bin depending
+# on if it's part of the X11 distribution, or if it's installed from pkgsrc
+# (security/ssh-askpass).
#
+.if exists(${X11BASE}/bin/ssh-askpass)
+MAKE_ENV+= ASKPASS_LOCATION=${X11BASE}/bin
+.else
MAKE_ENV+= ASKPASS_LOCATION=${X11PREFIX}/bin
+.endif
pre-configure:
cd ${WRKSRC} && autoreconf