X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fmkresin.git;a=blobdiff_plain;f=include%2Fpackage-bin.mk;h=4ae049af5409687f6166d494f50f1da7cb66587e;hp=c6cb9caf41dfdc220178ffc4b9694aaff270ff3b;hb=647614803473757e3b2d93d46938afccd61a5a5d;hpb=28f44a4f910046267a943349f71501991c15d573 diff --git a/include/package-bin.mk b/include/package-bin.mk index c6cb9caf41..4ae049af54 100644 --- a/include/package-bin.mk +++ b/include/package-bin.mk @@ -1,4 +1,4 @@ -# +# # Copyright (C) 2007-2014 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. @@ -10,6 +10,7 @@ ifeq ($(DUMP),) ifeq ($(if $(VARIANT),$(BUILD_VARIANT)),$(VARIANT)) ifdef Package/$(1)/install ifneq ($(CONFIG_PACKAGE_$(1))$(DEVELOPER),) + $(_pkg_target)compile: $(PKG_BUILD_DIR)/.pkgdir/$(1).installed compile: install-bin-$(1) else compile: $(1)-disabled @@ -19,10 +20,19 @@ ifeq ($(DUMP),) endif endif - install-bin-$(1): $(STAMP_BUILT) - rm -rf $(BIN_DIR)/$(1) - $(INSTALL_DIR) $(BIN_DIR)/$(1) - $(call Package/$(1)/install,$(BIN_DIR)/$(1)) + $(PKG_BUILD_DIR)/.pkgdir/$(1).installed: $(STAMP_BUILT) + rm -rf $(PKG_BUILD_DIR)/.pkgdir/$(1) $$@ + mkdir -p $(PKG_BUILD_DIR)/.pkgdir/$(1) + $(call Package/$(1)/install,$(PKG_BUILD_DIR)/.pkgdir/$(1)) + touch $$@ + + install-bin-$(1): $(PKG_BUILD_DIR)/.pkgdir/$(1).installed + rm -rf $(BIN_DIR)/$(1) + -rmdir $(PKG_BUILD_DIR)/.pkgdir/$(1) >/dev/null 2>/dev/null + if [ -d $(PKG_BUILD_DIR)/.pkgdir/$(1) ]; then \ + $(INSTALL_DIR) $(BIN_DIR)/$(1) && \ + $(CP) $(PKG_BUILD_DIR)/.pkgdir/$(1)/. $(BIN_DIR)/$(1)/; \ + fi clean-$(1): rm -rf $(BIN_DIR)/$(1)