summaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authornico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-08-28 15:09:21 +0000
committernico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-08-28 15:09:21 +0000
commit2c438cfdf236e2479552682c098e174226e0935b (patch)
treeafcdf7501a5b39caf74ea9841e8052f973e8c183 /package
parentf08f0691af7bd6dc266fff403ca4ac8b48fa62cb (diff)
json-c: fix package name, add UninstallDev
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8528 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rw-r--r--package/libjson-c/Makefile23
1 files changed, 17 insertions, 6 deletions
diff --git a/package/libjson-c/Makefile b/package/libjson-c/Makefile
index aa9db5162..0180d5951 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))