remove a broken patch that should have been nuked with the busybox upgrade (#2809)

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

diff --git a/package/libjson-c/Makefile b/package/libjson-c/Makefile
index aa9db51..bcb2984 100644 (file)
--- a/package/libjson-c/Makefile
+++ b/package/libjson-c/Makefile
@@ -18,29 +18,41 @@ PKG_MD5SUM:=
 
 include $(INCLUDE_DIR)/package.mk
 
 
 include $(INCLUDE_DIR)/package.mk
 

-define Package/json-c
+define Package/libjson

   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=javascript object notation
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=javascript object notation

-  DESCRIPTION:=library for javascript object notation backends

   URL:=http://oss.metaparadigm.com/json-c/
 endef
 
   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) \
 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
                DESTDIR="$(PKG_INSTALL_DIR)" \
                all install
 endef
 
 define Build/InstallDev

-       mkdir -p $(STAGING_DIR)/
-       $(CP) -r $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
+       mkdir -p $(1)/usr/include
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/json $(1)/usr/include/
+       mkdir -p $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libjson.{a,so*} $(1)/usr/lib/
+       mkdir -p $(1)/usr/lib/pkgconfig
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/json.pc $(1)/usr/lib/pkgconfig/
+endef
+
+define Build/UninstallDev
+       rm -rf  $(1)/usr/include/json \
+               $(1)/usr/lib/libjson.{a,so*} \
+               $(1)/usr/lib/pkgconfig/json.pc

 endef
 
 endef
 

-define Package/libpcap/install
+define Package/libjson/install

        $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libjson.so.* $(1)/usr/lib/
 endef
 
        $(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))