q66 pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=1884e4813ae1a4b284fc899d9d219f9bd02e890b
commit 1884e4813ae1a4b284fc899d9d219f9bd02e890b Author: Daniel Kolesa <[email protected]> Date: Tue Nov 11 15:07:03 2014 +0000 po: disable xgettext_wrapper for the time being (not really used and possibly won't be) --- Makefile.am | 16 +--------------- configure.ac | 3 --- po/{Makevars.in => Makevars} | 9 --------- po/xgettext_wrapper.sh | 16 ---------------- 4 files changed, 1 insertion(+), 43 deletions(-) diff --git a/Makefile.am b/Makefile.am index 6ddb5ea..599a8f2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -104,9 +104,7 @@ old/README.evas \ old/README.evil \ spec/efl.spec \ pkgbuild/PKGBUILD \ -pkgbuild/efl.install \ -po/xgettext_wrapper.sh \ -po/Makevars.in +pkgbuild/efl.install if HAVE_FREEBSD pkgconfigdir = $(libdir)data/pkgconfig @@ -437,15 +435,3 @@ pkgbuild:: clean-local: rm -rf benchmark coverage - -# Makevars is generated in top source directory, even for out-of-tree -distclean-local: - rm -f $(top_srcdir)/po/Makevars - -# we need this to remove Makevars from dist -dist-hook: - rm -f $(distdir)/po/Makevars - -# in dist tree po is read only, and we need to generate Makevars in there -distcheck-hook: - chmod +w $(distdir)/po diff --git a/configure.ac b/configure.ac index be61443..8880089 100644 --- a/configure.ac +++ b/configure.ac @@ -248,14 +248,12 @@ AM_GNU_GETTEXT_VERSION([0.18]) m4_ifdef([AC_GNU_GETTEXT], [ AC_GNU_GETTEXT([external]) po_makefile_in=po/Makefile.in -po_makevars="${srcdir}/po/Makevars:po/Makevars.in" have_po="yes" ], [ m4_ifdef([AM_GNU_GETTEXT], [ AM_GNU_GETTEXT([external]) po_makefile_in=po/Makefile.in -po_makevars="${srcdir}/po/Makevars:po/Makevars.in" have_po="yes" ], [ @@ -4539,7 +4537,6 @@ dbus-services/org.enlightenment.Ethumb.service systemd-services/efreet.service systemd-services/ethumb.service $po_makefile_in -$po_makevars cmakeconfig/EflConfig.cmake cmakeconfig/EflConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in cmakeconfig/EinaConfig.cmake diff --git a/po/Makevars.in b/po/Makevars similarity index 84% rename from po/Makevars.in rename to po/Makevars index 0350cbc..22837ab 100644 --- a/po/Makevars.in +++ b/po/Makevars @@ -7,15 +7,6 @@ DOMAIN = $(PACKAGE) subdir = po top_builddir = .. -# Save xgettext path -XGETTEXT_FALLBACK := $(XGETTEXT) - -# Override xgettext with a LuaJIT aware variant (which calls -# into plain xgettext if it needs to, and handles Lua on its own) -XGETTEXT = ELUA_INTREE="$(top_srcdir)/src/bin/elua/elua@EXEEXT@" \ - ELUA="@elua_bin@" XGETTEXT="$(XGETTEXT_FALLBACK)" \ - $(top_srcdir)/po/xgettext_wrapper.sh - # These options get passed to xgettext. XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --from-code=UTF-8 --foreign-user diff --git a/po/xgettext_wrapper.sh b/po/xgettext_wrapper.sh deleted file mode 100755 index 730d2fd..0000000 --- a/po/xgettext_wrapper.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -ELUA_BIN="$ELUA" - -if [ ! "$ELUA_BIN" ]; then - ELUA_BIN="${ELUA_INTREE}" - export EFL_RUN_IN_TREE=1 -fi - -if [ -x "$ELUA_BIN" ]; then - $ELUA_BIN xgettext "$@" -else - $XGETTEXT "$@" -fi - -exit $? --
