From af316c2afb7467d784d603c0a6ace4352473abd3 Mon Sep 17 00:00:00 2001 From: Bastian Krause Date: Mon, 25 Feb 2019 15:19:19 +0100 Subject: bash: use ptx/ifdef and ptx/wwo macros Signed-off-by: Bastian Krause Signed-off-by: Michael Olbrich --- rules/bash.make | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'rules/bash.make') diff --git a/rules/bash.make b/rules/bash.make index 2a862be13..4abce8323 100644 --- a/rules/bash.make +++ b/rules/bash.make @@ -30,8 +30,9 @@ BASH_LICENSE := GPL-3.0-only # ---------------------------------------------------------------------------- BASH_PATH := PATH=$(CROSS_PATH) -BASH_ENV := $(CROSS_ENV) - +BASH_ENV := \ + $(CROSS_ENV) \ + bash_cv_job_control_missing=$(call ptx/ifdef, PTXCONF_BASH_JOBS, present, missing) BASH_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ @@ -71,15 +72,8 @@ BASH_AUTOCONF := \ --$(call ptx/endis, PTXCONF_BASH_SEP_HELPFILES)-separate-helpfiles \ --$(call ptx/endis, PTXCONF_BASH_SINGLE_HELPLINE)-single-help-strings \ --$(call ptx/endis, PTXCONF_BASH_GPROF)-profiling \ - --$(call ptx/endis, PTXCONF_BASH_STATIC)-static-link - -ifdef PTXCONF_BASH_CURSES -BASH_AUTOCONF += --with-curses -endif - -ifdef PTXCONF_BASH_JOBS -BASH_ENV += bash_cv_job_control_missing=present -endif + --$(call ptx/endis, PTXCONF_BASH_STATIC)-static-link \ + --$(call ptx/wwo, PTXCONF_BASH_CURSES)-curses # ---------------------------------------------------------------------------- # Target-Install -- cgit v1.2.3