diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2007-09-28 01:45:11 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2007-09-28 01:45:11 +0000 |
| commit | bb6c4aade1c3174895429f168d4eac7a67d312cd (patch) | |
| tree | eb4212ed9fc412f6018213aec05fae3059ed20bf /package/libjson-c | |
| parent | 499485004b52b5960c950922fb1dedcedd0923fa (diff) | |
| download | upstream-bb6c4aade1c3174895429f168d4eac7a67d312cd.tar.gz upstream-bb6c4aade1c3174895429f168d4eac7a67d312cd.tar.bz2 upstream-bb6c4aade1c3174895429f168d4eac7a67d312cd.zip | |
add $(STAGING_DIR) as argument to the InstallDev template and update packages accordingly - this way we can reuse InstallDev to automatically generate UninstallDev or create -dev packages
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9052 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/libjson-c')
| -rw-r--r-- | package/libjson-c/Makefile | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/package/libjson-c/Makefile b/package/libjson-c/Makefile index c11bf085b4..c2adc7c90a 100644 --- a/package/libjson-c/Makefile +++ b/package/libjson-c/Makefile @@ -36,20 +36,20 @@ 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/ + $(SED) 's,-I$$$${includedir}/,-I$(1)/usr/include/,g' $(1)/usr/lib/pkgconfig/json.pc + $(SED) 's,-L$$$${libdir},,g' $(1)/usr/lib/pkgconfig/json.pc 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 |