Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/pkgsrc/net/samba/Makefile,v rcsdiff: /ftp/cvs/cvsroot/pkgsrc/net/samba/Makefile,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.150 retrieving revision 1.151 diff -u -p -r1.150 -r1.151 --- pkgsrc/net/samba/Makefile 2005/11/15 13:58:14 1.150 +++ pkgsrc/net/samba/Makefile 2005/12/05 20:50:49 1.151 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.150 2005/11/15 13:58:14 jlam Exp $ +# $NetBSD: Makefile,v 1.151 2005/12/05 20:50:49 rillig Exp $ .include "Makefile.mirrors" @@ -38,14 +38,14 @@ SAMBA_STATEDIR?= ${SAMBA_VARDIR}/db/samb SAMBA_VARDIR?= ${VARBASE} WINBINDD_RCD_SCRIPT= # empty -FILES_SUBST= SAMBA_ETCDIR=${SAMBA_ETCDIR} -FILES_SUBST+= SAMBA_LOCKDIR=${SAMBA_LOCKDIR} -FILES_SUBST+= SAMBA_LOGDIR=${SAMBA_LOGDIR} -FILES_SUBST+= SAMBA_PIDDIR=${SAMBA_PIDDIR} -FILES_SUBST+= SAMBA_PRIVATE=${SAMBA_PRIVATE} -FILES_SUBST+= SAMBA_STATEDIR=${SAMBA_STATEDIR} -FILES_SUBST+= SAMBA_VARDIR=${SAMBA_VARDIR} -FILES_SUBST+= WINBINDD_RCD_SCRIPT=${WINBINDD_RCD_SCRIPT} +FILES_SUBST+= SAMBA_ETCDIR=${SAMBA_ETCDIR:Q} +FILES_SUBST+= SAMBA_LOCKDIR=${SAMBA_LOCKDIR:Q} +FILES_SUBST+= SAMBA_LOGDIR=${SAMBA_LOGDIR:Q} +FILES_SUBST+= SAMBA_PIDDIR=${SAMBA_PIDDIR:Q} +FILES_SUBST+= SAMBA_PRIVATE=${SAMBA_PRIVATE:Q} +FILES_SUBST+= SAMBA_STATEDIR=${SAMBA_STATEDIR:Q} +FILES_SUBST+= SAMBA_VARDIR=${SAMBA_VARDIR:Q} +FILES_SUBST+= WINBINDD_RCD_SCRIPT=${WINBINDD_RCD_SCRIPT:Q} CONFIGURE_ARGS+= --with-configdir=${SAMBA_ETCDIR} CONFIGURE_ARGS+= --with-libdir=${SAMBA_LIBDIR}