X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Flibjson-c%2FMakefile;h=f713cc61574a9e95ba02d03c48e64b1327409790;hb=f5df126e9e8db55b28a5e3deb479f6b125c4a453;hp=aa9db51621255357779431e282ca566a55330016;hpb=e1c9572b15974ffa98eff8b8f4bd77444d44dbd9;p=openwrt-10.03%2F.git

diff --git a/package/libjson-c/Makefile b/package/libjson-c/Makefile
index aa9db5162..f713cc615 100644
--- a/package/libjson-c/Makefile
+++ b/package/libjson-c/Makefile
@@ -18,29 +18,35 @@ PKG_MD5SUM:=
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/json-c
+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) \
-		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 $(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 Package/libpcap/install
+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))