diff options
| author | Nicolas Thill <nico@openwrt.org> | 2007-08-28 15:09:21 +0000 |
|---|---|---|
| committer | Nicolas Thill <nico@openwrt.org> | 2007-08-28 15:09:21 +0000 |
| commit | d06fe5e328a26f7b2ac2683ecc56a96d399c856a (patch) | |
| tree | 1232d22bcfce9ab87cc1b94c185bfb691db14713 | |
| parent | 9f4bd6483f1240c5098b5c634c62cde518a288d8 (diff) | |
| download | master-31e0f0ae-d06fe5e328a26f7b2ac2683ecc56a96d399c856a.tar.gz master-31e0f0ae-d06fe5e328a26f7b2ac2683ecc56a96d399c856a.tar.bz2 master-31e0f0ae-d06fe5e328a26f7b2ac2683ecc56a96d399c856a.zip | |
json-c: fix package name, add UninstallDev
SVN-Revision: 8528
| -rw-r--r-- | package/libjson-c/Makefile | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/package/libjson-c/Makefile b/package/libjson-c/Makefile index aa9db51621..0180d5951c 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)) |