From: Felix Fietkau <nbd@nbd.name>
Date: Mon, 23 Jan 2017 11:32:04 +0000 (+0100)
Subject: build: fix bin/ package empty check
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=fb07085218859e0afe033d8a32ac2618303911ff;hp=afd2827c5c51361175d2e2ac9888d5ed59db5175;p=librecmc%2Flibrecmc.git

build: fix bin/ package empty check

$(wildcard) is evaluated too early in the build process

Signed-off-by: Felix Fietkau <nbd@nbd.name>
---

diff --git a/include/package-bin.mk b/include/package-bin.mk
index 3d0baad228..68f5831340 100644
--- a/include/package-bin.mk
+++ b/include/package-bin.mk
@@ -27,10 +27,12 @@ ifeq ($(DUMP),)
 		touch $$@
 
     install-bin-$(1): $(PKG_BUILD_DIR)/.pkgdir/$(1).installed
-	  rm -rf $(BIN_DIR)/$(1)
-	  $(if $(wildcard $(PKG_BUILD_DIR)/.pkgdir/$(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
+	[ -d $(PKG_BUILD_DIR)/.pkgdir/$(1) ] && { \
+		$(INSTALL_DIR) $(BIN_DIR)/$(1) && \
+		$(CP) $(PKG_BUILD_DIR)/.pkgdir/$(1)/. $(BIN_DIR)/$(1)/; \
+	}
 
     clean-$(1):
 	  rm -rf $(BIN_DIR)/$(1)