From 402485bfcc6d1246c23dfee03eab753b379b684c Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Wed, 24 Sep 2008 22:02:11 +0000 Subject: [PATCH] some BSD compatibility stuff --- Makefile | 4 ++-- build/module.mk | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 6c7d399e7..e673b22dc 100644 --- a/Makefile +++ b/Makefile @@ -30,8 +30,8 @@ luahost: luabuild hostcopy hostcopy: mkdir -p host/tmp - for i in $(MODULES); do cp -a $$i/dist/* host/ -R 2>/dev/null || true; done - for i in $(MODULES); do cp -a $$i/hostfiles/* host/ -R 2>/dev/null || true; done + for i in $(MODULES); do cp -pR $$i/dist/* host/ 2>/dev/null || true; done + for i in $(MODULES); do cp -pR $$i/hostfiles/* host/ 2>/dev/null || true; done rm -f host/luci ln -s .$(LUCI_MODULEDIR) host/luci rm -rf /tmp/luci-* || true diff --git a/build/module.mk b/build/module.mk index 7a5cc32ce..18eda9d8b 100644 --- a/build/module.mk +++ b/build/module.mk @@ -23,11 +23,11 @@ luasource: mkdir -p dist$(LUA_MODULEDIR) mkdir -p dist$(LUCI_MODULEDIR) mkdir -p dist$(HTDOCS) - cp -a root/* dist -R 2>/dev/null || true - cp -a luasrc/* dist$(LUCI_MODULEDIR) -R 2>/dev/null || true - cp -a lua/* dist$(LUA_MODULEDIR) -R 2>/dev/null || true - cp -a htdocs/* dist$(HTDOCS) -R 2>/dev/null || true - for i in $$(find dist -name .svn); do rm $$i -rf || true; done + cp -pR root/* dist 2>/dev/null || true + cp -pR luasrc/* dist$(LUCI_MODULEDIR) 2>/dev/null || true + cp -pR lua/* dist$(LUA_MODULEDIR) 2>/dev/null || true + cp -pR htdocs/* dist$(HTDOCS) 2>/dev/null || true + for i in $$(find dist -name .svn); do rm -rf $$i || true; done for i in dist$(LUCI_MODULEDIR)/i18n/*.xml; do [ -f "$$i" ] && rm $$i; done || true -- 2.11.0