summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-08-08 02:24:37 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-08-08 02:24:37 +0000
commit33da5011070a62ee5a875c757b437190efb19da2 (patch)
tree32696641db0c5567c7a539d9c2d7fd12935ac7c6
parentb69805034db9799823a058fed4dec7e96f36fb96 (diff)
add target for library specific installations into the root staging dir, fix ipkg build dependency on the package build stamp
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17168 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/package-ipkg.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
index debed2dfe4..4af052c37a 100644
--- a/include/package-ipkg.mk
+++ b/include/package-ipkg.mk
@@ -82,12 +82,13 @@ ifeq ($(DUMP),)
$($(1)_COMMANDS) \
)
- $(STAGING_DIR_ROOT)/stamp/.$(1)_installed:
+ $(STAGING_DIR_ROOT)/stamp/.$(1)_installed: $(STAMP_BUILT)
mkdir -p $(STAGING_DIR_ROOT)/stamp
$(call Package/$(1)/install,$(STAGING_DIR_ROOT))
+ $(call Package/$(1)/install_lib,$(STAGING_DIR_ROOT))
touch $$@
- $$(IPKG_$(1)): $(STAGING_DIR)/etc/ipkg.conf $(PKG_BUILD_DIR)/.built $$(IDIR_$(1))/CONTROL/control
+ $$(IPKG_$(1)): $(STAGING_DIR)/etc/ipkg.conf $(STAMP_BUILT) $$(IDIR_$(1))/CONTROL/control
$(call Package/$(1)/install,$$(IDIR_$(1)))
mkdir -p $(PACKAGE_DIR)
-find $$(IDIR_$(1)) -name 'CVS' -o -name '.svn' -o -name '.#*' | $(XARGS) rm -rf