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

diff --git a/package/libjson-c/Makefile b/package/libjson-c/Makefile
index 0180d5951c..01116aaf63 100644
--- a/package/libjson-c/Makefile
+++ b/package/libjson-c/Makefile
@@ -22,10 +22,13 @@ define Package/libjson
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=javascript object notation
-  DESCRIPTION:=library for javascript object notation backends
   URL:=http://oss.metaparadigm.com/json-c/
 endef
 
+define Package/libjson/description
+ This package contains a library for javascript object notation backends.
+endef
+
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
@@ -33,20 +36,18 @@ define Build/Compile
 endef
 
 define Build/InstallDev
-	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
+	mkdir -p $(1)/usr/include
+	$(CP) -r $(PKG_INSTALL_DIR)/usr/include/json $(1)/usr/include/
+	mkdir -p $(1)/usr/lib
+	$(CP) -r $(PKG_INSTALL_DIR)/usr/lib/libjson.{a,so*} $(1)/usr/lib/
+	mkdir -p $(1)/usr/lib/pkgconfig
+	$(CP) -r $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/json.pc $(1)/usr/lib/pkgconfig/
 endef
 
 define Build/UninstallDev
-	rm -rf	$(STAGING_DIR)/usr/include/json \
-		$(STAGING_DIR)/usr/lib/libjson.{a,so*} \
-		$(STAGING_DIR)/usr/lib/pkgconfig/json.pc
+	rm -rf	$(1)/usr/include/json \
+		$(1)/usr/lib/libjson.{a,so*} \
+		$(1)/usr/lib/pkgconfig/json.pc
 endef
 
 define Package/libjson/install