diff options
| author | jlam <jlam@pkgsrc.org> | 2005-11-15 13:58:14 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2005-11-15 13:58:14 +0000 |
| commit | 55650fc6a8a5769d2358c9e8fcb190d854e9e42a (patch) | |
| tree | e424ed32ff790b75431db3ab35b1685688e68404 | |
| parent | a1247dd801a8a6573f7539b0cc50984a337519fe (diff) | |
| download | pkgsrc-55650fc6a8a5769d2358c9e8fcb190d854e9e42a.tar.gz | |
Move WINBINDD_RCD_SCRIPT fix entirely from options.mk to Makefile as the
last two revisions of options.mk and Makefile fixed the same problem.
| -rw-r--r-- | net/samba/Makefile | 3 | ||||
| -rw-r--r-- | net/samba/options.mk | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/net/samba/Makefile b/net/samba/Makefile index a5ce4e70056..948f1805cbe 100644 --- a/net/samba/Makefile +++ b/net/samba/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.149 2005/11/15 11:28:23 tron Exp $ +# $NetBSD: Makefile,v 1.150 2005/11/15 13:58:14 jlam Exp $ .include "Makefile.mirrors" @@ -36,6 +36,7 @@ SAMBA_PIDDIR?= ${SAMBA_VARDIR}/run SAMBA_PRIVATE?= ${SAMBA_ETCDIR}/private SAMBA_STATEDIR?= ${SAMBA_VARDIR}/db/samba SAMBA_VARDIR?= ${VARBASE} +WINBINDD_RCD_SCRIPT= # empty FILES_SUBST= SAMBA_ETCDIR=${SAMBA_ETCDIR} FILES_SUBST+= SAMBA_LOCKDIR=${SAMBA_LOCKDIR} diff --git a/net/samba/options.mk b/net/samba/options.mk index fe39a95ee0e..c3f2793eb31 100644 --- a/net/samba/options.mk +++ b/net/samba/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.10 2005/11/14 16:51:42 jlam Exp $ +# $NetBSD: options.mk,v 1.11 2005/11/15 13:58:14 jlam Exp $ # Recommended package options for various setups: # @@ -127,7 +127,6 @@ SAMBA_STATIC_MODULES:= ${SAMBA_STATIC_MODULES},idmap_ad . endif WINBINDD_RCD_SCRIPT= winbindd -FILES_SUBST+= WINBINDD_RCD_SCRIPT=${WINBINDD_RCD_SCRIPT} PLIST_SUBST+= WINBIND= # Determine the proper name for the winbind and WINS NSS modules. @@ -189,7 +188,6 @@ samba-nss-wins-install: . endif .else CONFIGURE_ARGS+= --without-winbind -FILES_SUBST+= WINBINDD_RCD_SCRIPT= PLIST_SUBST+= WINBIND="@comment " PLIST_SUBST+= PAM_WINBIND="@comment no PAM winbind module" PLIST_SUBST+= NSS_WINBIND="@comment no NSS winbind module" |