diff options
Diffstat (limited to 'net/ja-samba')
| -rw-r--r-- | net/ja-samba/Makefile | 16 | ||||
| -rw-r--r-- | net/ja-samba/options.mk | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/net/ja-samba/Makefile b/net/ja-samba/Makefile index cc2e46c8282..ec73e0eef36 100644 --- a/net/ja-samba/Makefile +++ b/net/ja-samba/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2005/12/05 20:50:46 rillig Exp $ +# $NetBSD: Makefile,v 1.41 2005/12/05 23:55:14 rillig Exp $ DISTNAME= samba-${SAMBA_VERSION}-ja-${JA_VERSION} PKGNAME= ja-samba-${SAMBA_VERSION}.${JA_PKG_VERSION} @@ -41,13 +41,13 @@ FILES_SUBST+= SAMBA_PIDDIR=${SAMBA_PIDDIR:Q} FILES_SUBST+= SAMBA_PRIVATE=${SAMBA_PRIVATE:Q} FILES_SUBST+= SAMBA_VARDIR=${SAMBA_VARDIR:Q} -CONFIGURE_ARGS+= --with-configdir=${SAMBA_ETCDIR} -CONFIGURE_ARGS+= --with-libdir=${SAMBA_LIBDIR} -CONFIGURE_ARGS+= --with-lockdir=${SAMBA_LOCKDIR} -CONFIGURE_ARGS+= --with-logfilebase=${SAMBA_LOGDIR} -CONFIGURE_ARGS+= --with-piddir=${SAMBA_PIDDIR} -CONFIGURE_ARGS+= --with-privatedir=${SAMBA_PRIVATE} -CONFIGURE_ARGS+= --localstatedir=${SAMBA_VARDIR} +CONFIGURE_ARGS+= --with-configdir=${SAMBA_ETCDIR:Q} +CONFIGURE_ARGS+= --with-libdir=${SAMBA_LIBDIR:Q} +CONFIGURE_ARGS+= --with-lockdir=${SAMBA_LOCKDIR:Q} +CONFIGURE_ARGS+= --with-logfilebase=${SAMBA_LOGDIR:Q} +CONFIGURE_ARGS+= --with-piddir=${SAMBA_PIDDIR:Q} +CONFIGURE_ARGS+= --with-privatedir=${SAMBA_PRIVATE:Q} +CONFIGURE_ARGS+= --localstatedir=${SAMBA_VARDIR:Q} CONFIGURE_ARGS+= --with-codepagedir=${SAMBA_LIBDIR}/codepages CONFIGURE_ARGS+= --with-swatdir=${PREFIX}/share/samba/swat diff --git a/net/ja-samba/options.mk b/net/ja-samba/options.mk index 044647dc121..518cf3d4879 100644 --- a/net/ja-samba/options.mk +++ b/net/ja-samba/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2005/06/19 18:38:40 taca Exp $ +# $NetBSD: options.mk,v 1.5 2005/12/05 23:55:14 rillig Exp $ # Global and legacy options @@ -60,7 +60,7 @@ PLIST_SUBST+= SMBMOUNT="@comment " .if !empty(PKG_OPTIONS:Mssl) .include "../../security/openssl/buildlink3.mk" CONFIGURE_ARGS+= --with-ssl -CONFIGURE_ARGS+= --with-sslinc=${SSLBASE} +CONFIGURE_ARGS+= --with-sslinc=${SSLBASE:Q} CFLAGS+= -I${SSLBASE}/include/openssl # ssl.h, err.h .else CONFIGURE_ARGS+= --without-ssl |