libs: cjson: correctly install to named include paths
authorKarl Palsson <karlp@tweak.net.au>
Mon, 14 Dec 2020 15:09:32 +0000 (15:09 +0000)
committerKarl Palsson <karlp@tweak.net.au>
Mon, 14 Dec 2020 15:13:06 +0000 (15:13 +0000)
Supports the more traditional "#include <cjson/cJSON.h>"
instead of dropping them in the root.

Signed-off-by: Karl Palsson <karlp@etactica.com>
libs/cjson/Makefile

index 4ba327b761b65c39e3bd67541949a68af526a25f..9aff81c1892421284a8eff45b2bba7a953a71e33 100644 (file)
@@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cJSON
 PKG_VERSION:=1.7.14
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/DaveGamble/cJSON/tar.gz/v$(PKG_VERSION)?
@@ -39,8 +39,8 @@ CMAKE_OPTIONS += -DENABLE_CJSON_TEST=OFF
 define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libcjson.pc $(1)/usr/lib/pkgconfig
-       $(INSTALL_DIR) $(1)/usr/include
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/cjson/cJSON.h $(1)/usr/include/
+       $(INSTALL_DIR) $(1)/usr/include/cjson
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/cjson/cJSON.h $(1)/usr/include/cjson
        $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcjson.so* $(1)/usr/lib/
 endef