diff options
Diffstat (limited to 'net/hobbitmon/Makefile')
| -rw-r--r-- | net/hobbitmon/Makefile | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/net/hobbitmon/Makefile b/net/hobbitmon/Makefile index 57d299436ba..b8a99b35551 100644 --- a/net/hobbitmon/Makefile +++ b/net/hobbitmon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/02/05 23:10:25 joerg Exp $ +# $NetBSD: Makefile,v 1.13 2006/03/12 15:00:55 rillig Exp $ # DISTNAME= hobbit-4.0-beta6 @@ -28,19 +28,19 @@ BBCGIURL?= /cgi-bin BBHOSTIP?= 127.0.0.1 PKG_GROUPS= ${BBGROUP} -PKG_USERS= ${BBUSER}:${BBGROUP}::Hobbit\ monitor:${BBTOPDIR} +PKG_USERS= ${BBUSER:Q}:${BBGROUP:Q}::Hobbit\ monitor:${BBTOPDIR:Q} CONFIGURE_ENV+= TARGET=hobbit -CONFIGURE_ENV+= FPING=${PREFIX}/sbin/fping -CONFIGURE_ENV+= RRDINC=${PREFIX}/include -CONFIGURE_ENV+= RRDLIB=${PREFIX}/lib/librrd.a -CONFIGURE_ENV+= PNGLIB=${PREFIX}/lib/libpng.a -CONFIGURE_ENV+= LDAPINC=${PREFIX}/include -CONFIGURE_ENV+= LDAPLIB=${PREFIX}/lib -CONFIGURE_ENV+= OSSLINC=${PREFIX}/include -CONFIGURE_ENV+= OSSLLIB=${PREFIX}/lib -CONFIGURE_ENV+= PCREINC=${PREFIX}/include -CONFIGURE_ENV+= PCRELIB=${PREFIX}/lib +CONFIGURE_ENV+= FPING=${PREFIX:Q}/sbin/fping +CONFIGURE_ENV+= RRDINC=${PREFIX:Q}/include +CONFIGURE_ENV+= RRDLIB=${PREFIX:Q}/lib/librrd.a +CONFIGURE_ENV+= PNGLIB=${PREFIX:Q}/lib/libpng.a +CONFIGURE_ENV+= LDAPINC=${PREFIX:Q}/include +CONFIGURE_ENV+= LDAPLIB=${PREFIX:Q}/lib +CONFIGURE_ENV+= OSSLINC=${PREFIX:Q}/include +CONFIGURE_ENV+= OSSLLIB=${PREFIX:Q}/lib +CONFIGURE_ENV+= PCREINC=${PREFIX:Q}/include +CONFIGURE_ENV+= PCRELIB=${PREFIX:Q}/lib CONFIGURE_ENV+= ENABLESSL=y CONFIGURE_ENV+= ENABLELDAP=y CONFIGURE_ENV+= ENABLELDAPSSL=y @@ -53,7 +53,7 @@ CONFIGURE_ENV+= BBCGIURL=${BBCGIURL:Q} CONFIGURE_ENV+= HTTPDGID=${APACHE_GROUP:Q} CONFIGURE_ENV+= BBLOGDIR=${BBLOGDIR:Q} CONFIGURE_ENV+= BBHOSTIP=${BBHOSTIP:Q} -CONFIGURE_ENV+= MANROOT=${PREFIX}/man +CONFIGURE_ENV+= MANROOT=${PREFIX:Q}/man CONFIGURE_ENV+= BARS=all CONFIGURE_ENV+= USENEWHIST=y CONFIGURE_ENV+= PIXELCOUNT=560 @@ -62,8 +62,9 @@ MAKE_ENV+= MAKE=${MAKE_PROGRAM:Q} MAKE_ENV+= PKGDIR=${PREFIX:Q} do-install: - cd ${WRKSRC} ; \ - if ${TEST} -f ${BBTOPDIR}/server/etc/bb-hosts ; then \ + set -e; \ + cd ${WRKSRC:Q}; \ + if ${TEST} -f ${BBTOPDIR:Q}/server/etc/bb-hosts ; then \ ${GMAKE} install ; \ else \ ${GMAKE} setup ; \ |