From: Karl Palsson Date: Mon, 14 Dec 2020 15:09:32 +0000 (+0000) Subject: libs: cjson: correctly install to named include paths X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0a3e0114ce9a1badc82fb80b5f15aba37b9c672b;p=feed%2Fpackages.git libs: cjson: correctly install to named include paths Supports the more traditional "#include " instead of dropping them in the root. Signed-off-by: Karl Palsson --- diff --git a/libs/cjson/Makefile b/libs/cjson/Makefile index 4ba327b761..9aff81c189 100644 --- a/libs/cjson/Makefile +++ b/libs/cjson/Makefile @@ -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