diff options
| author | minskim <minskim@pkgsrc.org> | 2004-10-23 08:10:40 +0000 |
|---|---|---|
| committer | minskim <minskim@pkgsrc.org> | 2004-10-23 08:10:40 +0000 |
| commit | 7580e8706e85f890b883b9f3c4edc72cae6ce87b (patch) | |
| tree | 70a1140bbd019e4e31760abffa4f7477969c9282 /shells | |
| parent | bfcc0832d5ad5ab230739963cf6f4cdf602d9624 (diff) | |
| download | pkgsrc-7580e8706e85f890b883b9f3c4edc72cae6ce87b.tar.gz | |
Append options to PKG_DEFAULT_OPTIONS instead of ${PKG_OPTIONS_VER},
following the semantic change of PKG_DEFAULT_OPTIONS.
Diffstat (limited to 'shells')
| -rw-r--r-- | shells/bash2/Makefile | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile index 2a49cd38c4e..f173e88ba3b 100644 --- a/shells/bash2/Makefile +++ b/shells/bash2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2004/10/22 23:54:22 minskim Exp $ +# $NetBSD: Makefile,v 1.59 2004/10/23 08:10:40 minskim Exp $ # DISTNAME= bash-2.05b @@ -31,21 +31,15 @@ PKG_SHELL= ${PREFIX}/bin/bash .include "../../mk/bsd.prefs.mk" # Global and legacy options -.if defined(BASH_STATIC) -. if !defined(PKG_OPTIONS.bash) -. if defined(BASH_STATIC) && !empty(BASH_STATIC:M[yY][eE][sS]) -PKG_OPTIONS.bash+= static -. endif -# Always enable multibyte support, because before converted to use -# bsd.options.mk, this package did not allow to turn off the multibyte -# support. -PKG_OPTIONS.bash+= multibyte -. endif +.if defined(BASH_STATIC) && !empty(BASH_STATIC:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= static .endif PKG_OPTIONS_VAR= PKG_OPTIONS.bash -PKG_OPTIONS.bash?= multibyte PKG_SUPPORTED_OPTIONS= multibyte static +.if !defined(PKG_OPTIONS.bash) +PKG_DEFAULT_OPTIONS+= multibyte +.endif .include "../../mk/bsd.options.mk" ## |