From a99b0363d0e3974087695f47f3c60b8959ae815a Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sun, 2 Dec 2012 12:20:38 +0000 Subject: [PATCH] package: use file_copy to deploy files/ in the package/install phase SVN-Revision: 34438 --- package/Makefile | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/package/Makefile b/package/Makefile index eab3f85dd6..e88efdfe9f 100644 --- a/package/Makefile +++ b/package/Makefile @@ -89,15 +89,7 @@ $(curdir)/install: $(TMP_DIR)/.build done || true @-$(MAKE) package/preconfig @if [ -d $(TOPDIR)/files ]; then \ - ( cd $(TOPDIR)/files; find -type f ) | \ - ( cd $(TARGET_DIR); while :; do \ - read FILE; \ - [ -z "$$FILE" ] && break; \ - [ -L "$$FILE" ] || continue; \ - echo "Removing symlink $(TARGET_DIR)/$$FILE"; \ - rm -f "$$FILE"; \ - done; ); \ - $(CP) $(TOPDIR)/files/. $(TARGET_DIR); \ + $(call file_copy,$(TOPDIR)/files/.,$(TARGET_DIR)); \ fi @mkdir -p $(TARGET_DIR)/etc/rc.d @( \ -- 2.25.1