summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-12-02 12:20:38 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-12-02 12:20:38 +0000
commit651ee3b9d425d70e2e9ec9dad65691fed6aeaa6e (patch)
treeba2134f5b24e10578c017a43897227abeb2b1e64
parent6d0c73d11bf42070b9a4732b68411e0696f673f2 (diff)
package: use file_copy to deploy files/ in the package/install phase
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34438 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/Makefile10
1 files changed, 1 insertions, 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
@( \