From b81b12de4eb3205d06b1f7653f36e1320ac81eb7 Mon Sep 17 00:00:00 2001
From: Koen Zandberg <koen@bergzand.net>
Date: Tue, 1 May 2018 11:12:39 +0200
Subject: [PATCH] cbor: Move header to cbor subdirectory

Prevents conflicts when multiple modules/packages provide a `cbor.h`
header.
---
 sys/Makefile.include          | 4 ++++
 sys/{ => cbor}/include/cbor.h | 0
 2 files changed, 4 insertions(+)
 rename sys/{ => cbor}/include/cbor.h (100%)

diff --git a/sys/Makefile.include b/sys/Makefile.include
index 24b8c7259b..dfbb94067b 100644
--- a/sys/Makefile.include
+++ b/sys/Makefile.include
@@ -2,6 +2,10 @@ ifneq (,$(filter nhdp,$(USEMODULE)))
   USEMODULE_INCLUDES += $(RIOTBASE)/sys/net/routing/nhdp
 endif
 
+ifneq (,$(filter cbor,$(USEMODULE)))
+  USEMODULE_INCLUDES += $(RIOTBASE)/sys/cbor/include
+endif
+
 ifneq (,$(filter crypto,$(USEMODULE)))
   USEMODULE_INCLUDES += $(RIOTBASE)/include/crypto
 endif
diff --git a/sys/include/cbor.h b/sys/cbor/include/cbor.h
similarity index 100%
rename from sys/include/cbor.h
rename to sys/cbor/include/cbor.h