summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2008-09-24 22:02:11 +0000
committerSteven Barth <steven@midlink.org>2008-09-24 22:02:11 +0000
commit402485bfcc6d1246c23dfee03eab753b379b684c (patch)
treeab232a128398b81330b6c5c6c35a27170d7ffb73
parent9dc504b285a80c381d612cb8dccc58ff5f39368e (diff)
some BSD compatibility stuff
-rw-r--r--Makefile4
-rw-r--r--build/module.mk10
2 files changed, 7 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 6c7d399e76..e673b22dc2 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 7a5cc32cee..18eda9d8b9 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