X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=include%2Fpackage-bin.mk;h=4ae049af5409687f6166d494f50f1da7cb66587e;hb=185c37467ead7892bd085cd87071e5d18f811431;hp=a777eadad92fad326ea152c2d1374947838ec9bf;hpb=c150a190f59afa3d34924a76bb9306bdb0914533;p=openwrt%2Fopenwrt.git diff --git a/include/package-bin.mk b/include/package-bin.mk index a777eadad9..4ae049af54 100644 --- a/include/package-bin.mk +++ b/include/package-bin.mk @@ -10,7 +10,7 @@ ifeq ($(DUMP),) ifeq ($(if $(VARIANT),$(BUILD_VARIANT)),$(VARIANT)) ifdef Package/$(1)/install ifneq ($(CONFIG_PACKAGE_$(1))$(DEVELOPER),) - .compile: $(PKG_BUILD_DIR)/.pkgdir/$(1).installed + $(_pkg_target)compile: $(PKG_BUILD_DIR)/.pkgdir/$(1).installed compile: install-bin-$(1) else compile: $(1)-disabled @@ -27,9 +27,12 @@ ifeq ($(DUMP),) touch $$@ install-bin-$(1): $(PKG_BUILD_DIR)/.pkgdir/$(1).installed - rm -rf $(BIN_DIR)/$(1) - $(INSTALL_DIR) $(BIN_DIR)/$(1) - $(CP) $(PKG_BUILD_DIR)/.pkgdir/$(1)/. $(BIN_DIR)/$(1)/ + 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)