From fcbf219de4559690f3ff97bba0782d511357ec21 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Tue, 6 May 2014 13:44:56 +0100 Subject: [PATCH] elua: remove xgettext_wrapper, instead expand the whole command into Makevars --- po/Makevars | 6 ++++-- po/xgettext_wrapper | 10 ---------- 2 files changed, 4 insertions(+), 12 deletions(-) delete mode 100755 po/xgettext_wrapper diff --git a/po/Makevars b/po/Makevars index 0b56f80f30..71266a8188 100644 --- 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 index d65c8d0959..0000000000 --- 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 $? -- 2.34.1