diff options
| author | salo <salo> | 2004-07-11 01:23:29 +0000 |
|---|---|---|
| committer | salo <salo> | 2004-07-11 01:23:29 +0000 |
| commit | bbddf7795e3237ae65527742440cfca5c2103fc9 (patch) | |
| tree | a046c81dbeaf3dda38938a822d220a74755ad746 /shells | |
| parent | 9d3f69734b847f6e839118f7fc7d7db749f0285c (diff) | |
| download | pkgsrc-bbddf7795e3237ae65527742440cfca5c2103fc9.tar.gz | |
Add {BA,Z}SH_STATIC to BUILD_DEFS.
Addresses request on tech-pkg@ by Georg Schwarz.
Diffstat (limited to 'shells')
| -rw-r--r-- | shells/bash2/Makefile | 8 | ||||
| -rw-r--r-- | shells/zsh/Makefile.common | 6 | ||||
| -rw-r--r-- | shells/zsh3/Makefile | 12 |
3 files changed, 16 insertions, 10 deletions
diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile index 5ab949a2c75..a923ce9aa0c 100644 --- a/shells/bash2/Makefile +++ b/shells/bash2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.53 2004/06/22 14:05:39 minskim Exp $ +# $NetBSD: Makefile,v 1.54 2004/07/11 01:23:29 salo Exp $ # DISTNAME= bash-2.05b @@ -30,10 +30,10 @@ PKG_SHELL= ${PREFIX}/bin/bash .include "../../mk/bsd.prefs.mk" -.if defined(BASH_STATIC) -. if !empty(BASH_STATIC:M[yY][eE][sS]) +BUILD_DEFS+= BASH_STATIC + +.if defined(BASH_STATIC) && !empty(BASH_STATIC:M[yY][eE][sS]) CONFIGURE_ARGS+= --enable-static-link -. endif .endif post-install: diff --git a/shells/zsh/Makefile.common b/shells/zsh/Makefile.common index 6611ff3ce50..8d79aa11aae 100644 --- a/shells/zsh/Makefile.common +++ b/shells/zsh/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.11 2004/05/06 22:29:36 cube Exp $ +# $NetBSD: Makefile.common,v 1.12 2004/07/11 01:23:29 salo Exp $ DISTNAME= zsh-${ZSH_VERSION} PKGREVISION= 1 @@ -26,7 +26,9 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews .include "../../mk/bsd.prefs.mk" -.if defined(ZSH_STATIC) +BUILD_DEFS+= ZSH_STATIC + +.if defined(ZSH_STATIC) && !empty(ZSH_STATIC:M[Yy][Ee][Ss]) CONFIGURE_ARGS+=--disable-dynamic LDFLAGS+= -static .else diff --git a/shells/zsh3/Makefile b/shells/zsh3/Makefile index 52b15cd1d16..be5c2c427c4 100644 --- a/shells/zsh3/Makefile +++ b/shells/zsh3/Makefile @@ -1,4 +1,5 @@ -# $NetBSD: Makefile,v 1.11 2004/04/18 04:36:42 snj Exp $ +# $NetBSD: Makefile,v 1.12 2004/07/11 01:23:29 salo Exp $ +# DISTNAME= zsh-3.0.8 CATEGORIES= shells @@ -13,14 +14,17 @@ HOMEPAGE= http://sunsite.dk/zsh/ COMMENT= The Z shell GNU_CONFIGURE= yes +USE_BUILDLINK3= YES USE_MAKEINFO= YES +USE_PKGINSTALL= YES + INFO_FILES= zsh.info -USE_BUILDLINK3= YES -USE_PKGINSTALL= YES .include "../../mk/bsd.prefs.mk" -.if defined(ZSH_STATIC) +BUILD_DEFS+= ZSH_STATIC + +.if defined(ZSH_STATIC) && !empty(ZSH_STATIC:M[Yy][Ee][Ss]) LDFLAGS+= -static .endif |