From d4125cfaa4817d6dfd8cd024c6aee8ea855bda7c Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 17 Nov 2007 14:14:16 +0000
Subject: fix hostapd rebuild check, isolate the common src/ directory for
 hostapd variants as well to fix compile errors when both variants are
 selected (#2722)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9575 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 rules.mk | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'rules.mk')

diff --git a/rules.mk b/rules.mk
index 14ff5acdf..d36c99495 100644
--- a/rules.mk
+++ b/rules.mk
@@ -138,12 +138,10 @@ $(call shvar,$(1))=$$(call $(1))
 export $(call shvar,$(1))
 endef
 
-define confvar
-$(1):=$$(strip $$($(1)))_
-$(foreach v,$(2),
-  $(1):=$$(strip $$($(1)))$(if $($(v)),y,n)
-)
-endef
+empty:=
+space:= $(empty) $(empty)
+merge=$(subst $(space),,$(1))
+confvar=$(call merge,$(foreach v,$(1),$(if $($(v)),y,n)))
 
 # file extension
 ext=$(word $(words $(subst ., ,$(1))),$(subst ., ,$(1)))
-- 
cgit v1.2.3