diff options
| author | Emanuel Haupt <ehaupt@FreeBSD.org> | 2013-01-14 14:59:07 +0000 |
|---|---|---|
| committer | Emanuel Haupt <ehaupt@FreeBSD.org> | 2013-01-14 14:59:07 +0000 |
| commit | 778a3def1185c1e43ca3d78de34231cedd7cb5ff (patch) | |
| tree | 5cb9b74ab485bd042608c9ba49dea78d5f3a20e7 /shells | |
| parent | aa37f16ceda411c3e31c7927ad03cb8aec8a470a (diff) | |
| download | ports-778a3def1185c1e43ca3d78de34231cedd7cb5ff.tar.gz ports-778a3def1185c1e43ca3d78de34231cedd7cb5ff.zip | |
Use pre-defined knob for the static build option (STATIC_BASH -> STATIC).
Notes
Notes:
svn path=/head/; revision=310391
Diffstat (limited to 'shells')
| -rw-r--r-- | shells/bash-devel/Makefile | 5 | ||||
| -rw-r--r-- | shells/bash-static-devel/Makefile | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/shells/bash-devel/Makefile b/shells/bash-devel/Makefile index e23544e82b30..c86a4a47cf98 100644 --- a/shells/bash-devel/Makefile +++ b/shells/bash-devel/Makefile @@ -26,12 +26,11 @@ COMMENT= The GNU Project's Bourne Again SHell IGNOREFILES= FAQ -OPTIONS_DEFINE= IMPLICITCD COLONBREAKSWORDS HELP NLS STATIC_BASH SYSLOG DOCS +OPTIONS_DEFINE= IMPLICITCD COLONBREAKSWORDS HELP NLS STATIC SYSLOG DOCS OPTIONS_DEFAULT=IMPLICITCD COLONBREAKSWORDS HELP NLS IMPLICITCD_DESC= Use directory name alone to cd into it COLONBREAKSWORDS_DESC= Colons break words HELP_DESC= Install the help files -STATIC_BASH_DESC= Compile without shared libs SYSLOG_DESC= Compile with syslog support .include <bsd.port.pre.mk> @@ -62,7 +61,7 @@ CONFIGURE_ARGS= --without-bash-malloc \ --disable-rpath \ --enable-disabled-builtins -.if ${PORT_OPTIONS:MSTATIC_BASH} || defined(NO_DYNAMICROOT) || (defined(NOSHARED) && ${NOSHARED:L} != "no") +.if ${PORT_OPTIONS:MSTATIC} || defined(NO_DYNAMICROOT) || (defined(NOSHARED) && ${NOSHARED:L} != "no") .if empty(PORT_OPTIONS:MNLS) WITHOUT_NLS=yes .endif diff --git a/shells/bash-static-devel/Makefile b/shells/bash-static-devel/Makefile index e942ae860ffb..a9ad10167aa2 100644 --- a/shells/bash-static-devel/Makefile +++ b/shells/bash-static-devel/Makefile @@ -3,6 +3,6 @@ MASTERDIR= ${.CURDIR}/../../shells/bash-devel -OPTIONS_SET= STATIC_BASH +OPTIONS_SET= STATIC .include "${MASTERDIR}/Makefile" |