Several escaping fixes

[project/luci.git] / build / module.mk

diff --git a/build/module.mk b/build/module.mk
index 3a947546b0a6eca7f79708f0916432f406aac832..f54037850feb68475f3bb79642731b59c68487af 100644 (file)
--- a/build/module.mk
+++ b/build/module.mk
@@ -8,16 +8,16 @@ all: build
 
 build: luabuild gccbuild
 
-luabuild: lua$(LUA_TARGET) i18n
+luabuild: i18n lua$(LUA_TARGET)
 
 gccbuild: compile
 compile:
 
 clean: luaclean
 
-i18n: luasource
-       [ -n "$(XSLTPROC)" ] && for i in dist$(LUCI_MODULEDIR)/i18n/*.xml; do [ -f "$$i" ]\
-       && { $(XSLTPROC) $(MAKEPATH)i18n-lua-xhtml1.xsl $$i > $${i/.xml/.lua}; rm $$i; }; done || true
+i18n:
+       [ -n "$(XSLTPROC)" ] && for i in luasrc/i18n/*.xml; do [ -f "$$i" ]\
+       && $(XSLTPROC) $(MAKEPATH)i18n-lua-xhtml1.xsl $$i > $${i/.xml/.lua}; done || true
 
 luasource:
        mkdir -p dist$(LUA_MODULEDIR)
@@ -28,6 +28,7 @@ luasource:
        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
+       for i in dist$(LUCI_MODULEDIR)/i18n/*.xml; do [ -f "$$i" ] && rm $$i; done || true
 
 
 luastrip: luasource