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

This commit is contained in:
Daniel Kolesa 2014-05-06 13:44:56 +01:00 committed by Daniel Kolesa
parent cbeaf5b58a
commit fcbf219de4
2 changed files with 4 additions and 12 deletions

View File

@ -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

View File

@ -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 $?