update madwifi to latest version (fixes #2403)

[openwrt.git] / package / libjson-c / Makefile

diff --git a/package/libjson-c/Makefile b/package/libjson-c/Makefile
index 0180d59..01116aa 100644 (file)
--- 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