diff options
Diffstat (limited to 'sysutils/bacula')
-rw-r--r-- | sysutils/bacula/Makefile | 4 | ||||
-rw-r--r-- | sysutils/bacula/Makefile.common | 12 | ||||
-rw-r--r-- | sysutils/bacula/hacks.mk | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/sysutils/bacula/Makefile b/sysutils/bacula/Makefile index 35c4d5d4488..84aa436c156 100644 --- a/sysutils/bacula/Makefile +++ b/sysutils/bacula/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.8 2005/11/22 19:33:06 tv Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:59 rillig Exp $ CONFLICTS+= bacula-client-[0-9]* .include "options.mk" -PLIST_SUBST+= BACULA_DB=${BACULA_DB} +PLIST_SUBST+= BACULA_DB=${BACULA_DB:Q} MESSAGE_SUBST+= PREFIX=${PREFIX} MESSAGE_SUBST+= PKGNAME_NOREV=${PKGNAME_NOREV} diff --git a/sysutils/bacula/Makefile.common b/sysutils/bacula/Makefile.common index 724d8046b50..d6b97b18cfc 100644 --- a/sysutils/bacula/Makefile.common +++ b/sysutils/bacula/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.17 2005/11/22 18:35:25 wiz Exp $ +# $NetBSD: Makefile.common,v 1.18 2005/12/05 20:50:59 rillig Exp $ DISTNAME= bacula-1.38.1 CATEGORIES= sysutils @@ -24,11 +24,11 @@ BACULA_WORKINGDIR?= ${VARBASE}/spool/bacula OWN_DIRS_PERMS+= ${BACULA_WORKINGDIR} root ${BACULA_GROUP} 770 -FILES_SUBST+= BACULA_ETCDIR=${PKG_SYSCONFDIR} -FILES_SUBST+= BACULA_PIDDIR=${BACULA_PIDDIR} -FILES_SUBST+= BACULA_GROUP=${BACULA_GROUP} -FILES_SUBST+= BACULA_DIR_USER=${BACULA_DIR_USER} -FILES_SUBST+= BACULA_SD_USER=${BACULA_SD_USER} +FILES_SUBST+= BACULA_ETCDIR=${PKG_SYSCONFDIR:Q} +FILES_SUBST+= BACULA_PIDDIR=${BACULA_PIDDIR:Q} +FILES_SUBST+= BACULA_GROUP=${BACULA_GROUP:Q} +FILES_SUBST+= BACULA_DIR_USER=${BACULA_DIR_USER:Q} +FILES_SUBST+= BACULA_SD_USER=${BACULA_SD_USER:Q} CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --with-scriptdir=${PREFIX}/libexec/bacula diff --git a/sysutils/bacula/hacks.mk b/sysutils/bacula/hacks.mk index 93f891dd808..04c94415455 100644 --- a/sysutils/bacula/hacks.mk +++ b/sysutils/bacula/hacks.mk @@ -1,6 +1,6 @@ -# $NetBSD: hacks.mk,v 1.1 2005/11/22 18:35:25 wiz Exp $ +# $NetBSD: hacks.mk,v 1.2 2005/12/05 20:50:59 rillig Exp $ -.ifndef BACULA_HACKS_MK +.if !defined(BACULA_HACKS_MK) BACULA_HACKS_MK= #defined ### gcc 4.0* has been reported to produce bad code on amd64 |