From 1d0227506a42992e6ba658cf52ce3ac5a0e26500 Mon Sep 17 00:00:00 2001 From: uebayasi Date: Fri, 17 Dec 2004 01:14:19 +0000 Subject: Define PKGSYSCONFDIR.eb as a shell command sequence, so that it could be evaluated by configure scripts at the configure stage. (Otherwise, pkg_admin(1) and pkg_info(1) can be executed only once before EB as a dependency is not installed yet, which results in that those commands return void.) --- textproc/eb/buildlink3.mk | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'textproc/eb') diff --git a/textproc/eb/buildlink3.mk b/textproc/eb/buildlink3.mk index 1c34e8e6f04..86fcfbe34bb 100644 --- a/textproc/eb/buildlink3.mk +++ b/textproc/eb/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2004/12/16 13:11:19 uebayasi Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2004/12/17 01:14:19 uebayasi Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ EB_BUILDLINK3_MK:= ${EB_BUILDLINK3_MK}+ @@ -12,17 +12,18 @@ BUILDLINK_PACKAGES+= eb _EB_REQD= 3.3.2nb1 +# This variable should be directly passed to shell commands. (E.g., a +# configure argument.) +# # XXX We need something generic. .include "../../mk/bsd.prefs.mk" -PKG_SYSCONFDIR.eb!= \ +PKG_SYSCONFDIR.eb=$$( \ if ${PKG_ADMIN} pmatch 'eb>=${_EB_REQD}' \ - `${PKG_INFO} -e eb` 2>/dev/null; then \ + $$( ${PKG_INFO} -e eb ) 2>/dev/null; then \ ${PKG_INFO} -B eb 2>/dev/null | \ - ${SED} -ne '/^PKG_SYSCONFDIR/ { \ - s/^PKG_SYSCONFDIR=//; p; }'; \ - else \ - ${ECHO}; \ - fi + ${SED} -ne '/^PKG_SYSCONFDIR/ \ + { s/^PKG_SYSCONFDIR=//; p; }'; \ + else ${ECHO}; fi ) .if !empty(EB_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.eb+= eb>=${_EB_REQD} -- cgit v1.2.3