diff options
author | Giovanni Di Sirio <gdisirio@gmail.com> | 2019-01-05 15:49:50 +0000 |
---|---|---|
committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2019-01-05 15:49:50 +0000 |
commit | b470e1ae0feb1d173465f8083248ad4324755592 (patch) | |
tree | 89eeb538bf0871730aa890c37b042988f7929654 /os/lib | |
parent | 90ddeb9ef88675bfd5cc84be3c2ee215f9404720 (diff) | |
download | ChibiOS-b470e1ae0feb1d173465f8083248ad4324755592.tar.gz ChibiOS-b470e1ae0feb1d173465f8083248ad4324755592.tar.bz2 ChibiOS-b470e1ae0feb1d173465f8083248ad4324755592.zip |
Improved search of configuration files.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12529 110e8d01-0319-4d1e-a829-52ad28d1bb01
Diffstat (limited to 'os/lib')
-rw-r--r-- | os/lib/lib.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/os/lib/lib.mk b/os/lib/lib.mk index 75b9fc3c3..7780318d2 100644 --- a/os/lib/lib.mk +++ b/os/lib/lib.mk @@ -3,11 +3,15 @@ ifeq ($(USE_SMART_BUILD),yes)
# Configuration files directory
-ifeq ($(CONFDIR),)
- CONFDIR = .
+ifeq ($(CHCONFDIR),)
+ ifeq ($(CONFDIR),)
+ CHCONFDIR = .
+ else
+ CHCONFDIR := $(CONFDIR)
+ endif
endif
-CHLIBCONF := $(strip $(shell cat $(CONFDIR)/chconf.h | egrep -e "\#define"))
+CHLIBCONF := $(strip $(shell cat $(CHCONFDIR)/chconf.h | egrep -e "\#define"))
LIBSRC :=
ifneq ($(findstring CH_CFG_USE_MAILBOXES TRUE,$(CHLIBCONF)),)
|