pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/textproc/eb Define PKGSYSCONFDIR.eb as a shell command...
details: https://anonhg.NetBSD.org/pkgsrc/rev/cc725ee986e6
branches: trunk
changeset: 485594:cc725ee986e6
user: uebayasi <uebayasi%pkgsrc.org@localhost>
date: Fri Dec 17 01:14:19 2004 +0000
description:
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.)
diffstat:
textproc/eb/buildlink3.mk | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diffs (35 lines):
diff -r f29ff3fd40f5 -r cc725ee986e6 textproc/eb/buildlink3.mk
--- a/textproc/eb/buildlink3.mk Fri Dec 17 00:36:45 2004 +0000
+++ b/textproc/eb/buildlink3.mk Fri Dec 17 01:14:19 2004 +0000
@@ -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 @@
_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}
Home |
Main Index |
Thread Index |
Old Index