small fixes mostly for kernel 2.6.31

[openwrt/svn-archive/archive.git] / include / package-ipkg.mk

diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
index 904bbd75af0afffbb24bc525a575989f63e0d243..bd4e28ce35559438c17a7c9f9e48405406f7a6cb 100644 (file)
--- a/include/package-ipkg.mk
+++ b/include/package-ipkg.mk
@@ -59,9 +59,12 @@ ifeq ($(DUMP),)
     $(eval $(call BuildIPKGVariable,$(1),postrm))
 
     $(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))
+       rm -rf $(STAGING_DIR_ROOT)/tmp-$(1)
+       mkdir -p $(STAGING_DIR_ROOT)/stamp $(STAGING_DIR_ROOT)/tmp-$(1)
+       $(call Package/$(1)/install,$(STAGING_DIR_ROOT)/tmp-$(1))
+       $(call Package/$(1)/install_lib,$(STAGING_DIR_ROOT)/tmp-$(1))
+       $(CP) $(STAGING_DIR_ROOT)/tmp-$(1)/. $(STAGING_DIR_ROOT)/
+       rm -rf $(STAGING_DIR_ROOT)/tmp-$(1)
        touch $$@
 
     $$(IPKG_$(1)): $(STAGING_DIR)/etc/ipkg.conf $(STAMP_BUILT)