X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Flibjson-c%2FMakefile;h=0180d5951cbd878f39ad518c581661de8b2be092;hb=d06fe5e328a26f7b2ac2683ecc56a96d399c856a;hp=aa9db51621255357779431e282ca566a55330016;hpb=9f4bd6483f1240c5098b5c634c62cde518a288d8;p=lede-git%2F.git

diff --git a/package/libjson-c/Makefile b/package/libjson-c/Makefile
index aa9db51621..0180d5951c 100644
--- a/package/libjson-c/Makefile
+++ b/package/libjson-c/Makefile
@@ -18,7 +18,7 @@ PKG_MD5SUM:=
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/json-c
+define Package/libjson
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=javascript object notation
@@ -28,19 +28,30 @@ endef
 
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CCOPT="$(TARGET_CFLAGS) -I$(BUILD_DIR)/linux/include" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef
 
 define Build/InstallDev
-	mkdir -p $(STAGING_DIR)/
-	$(CP) -r $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
+	mkdir -p $(STAGING_DIR)/usr/include
+	$(CP) -r $(PKG_INSTALL_DIR)/usr/include/json $(STAGING_DIR)/usr/include/
+	mkdir -p $(STAGING_DIR)/usr/lib
+	$(CP) -r $(PKG_INSTALL_DIR)/usr/lib/libjson.{a,so*} $(STAGING_DIR)/usr/lib/
+	mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
+	$(CP) -r $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/json.pc $(STAGING_DIR)/usr/lib/pkgconfig/
+	$(SED) 's,-I$$$${includedir}/,-I$(STAGING_DIR)/usr/include/,g' $(STAGING_DIR)/usr/lib/pkgconfig/json.pc
+	$(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/json.pc
 endef
 
-define Package/libpcap/install
+define Build/UninstallDev
+	rm -rf	$(STAGING_DIR)/usr/include/json \
+		$(STAGING_DIR)/usr/lib/libjson.{a,so*} \
+		$(STAGING_DIR)/usr/lib/pkgconfig/json.pc
+endef
+
+define Package/libjson/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libjson.so.* $(1)/usr/lib/
 endef
 
-$(eval $(call BuildPackage,json-c))
+$(eval $(call BuildPackage,libjson))