elua: remove xgettext_wrapper, instead expand the whole command into Makevars

diff --git a/po/Makevars b/po/Makevars
index 0b56f80f30a661489819dde4538aa0dbe76094cd..71266a81881a40fbe4ec0d8cddfbacc8882c6f30 100644 (file)
--- a/po/Makevars
+++ b/po/Makevars
@@ -10,8 +10,10 @@ top_builddir = ..
 # Save xgettext path
 XGETTEXT_FALLBACK := $(XGETTEXT)
 
-# Override xgettext with our own custom wrapper
-XGETTEXT = $(srcdir)/xgettext_wrapper $(top_builddir) $(XGETTEXT_FALLBACK)
+# Override xgettext with a LuaJIT aware variant (which calls
+# into plain xgettext if it needs to, and handles Lua on its own)
+XGETTEXT = XGETTEXT=$(XGETTEXT_FALLBACK) EFL_RUN_IN_TREE=1 \
+       $(top_builddir)/src/bin/elua/elua $(top_builddir)/src/bin/elua/xgettext.lua
 
 # These options get passed to xgettext.
 XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --from-code=UTF-8 --foreign-user

diff --git a/po/xgettext_wrapper b/po/xgettext_wrapper
deleted file mode 100755 (executable)
index d65c8d0..0000000
--- a/po/xgettext_wrapper
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-ELUAPATH=$1/src/bin/elua
-ELUA=${ELUAPATH}/elua
-LXGETTEXT=${ELUAPATH}/xgettext.lua
-export XGETTEXT=$2
-export EFL_RUN_IN_TREE=1
-shift
-shift
-$ELUA $LXGETTEXT "$@"
-exit $?