libextractor

1 files changed, 5 insertions, 15 deletions

diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index fabdc76c9..83d8838ac 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -8,14 +8,13 @@
 # Please note that the actual code of GNU gettext is covered by the GNU
 # General Public License and is *not* in the public domain.
 #
-# Origin: gettext-0.18.3
+# Origin: gettext-0.18
 GETTEXT_MACRO_VERSION = 0.18
 
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 
-SED = @SED@
 SHELL = /bin/sh
 @SET_MAKE@
 
@@ -97,14 +96,14 @@ CATALOGS = @CATALOGS@
         mv t-$@ $@
 
 
-all: all-@USE_NLS@
+all: check-macro-version all-@USE_NLS@
 
 all-yes: stamp-po
 all-no:
 
 # Ensure that the gettext macros and this Makefile.in.in are in sync.
-CHECK_MACRO_VERSION = \
-        test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \
+check-macro-version:
+        @test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \
           || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \
                exit 1; \
              }
@@ -124,7 +123,6 @@ CHECK_MACRO_VERSION = \
 # $(POFILES) has been designed to not touch files that don't need to be
 # changed.
 stamp-po: $(srcdir)/$(DOMAIN).pot
-        @$(CHECK_MACRO_VERSION)
         test ! -f $(srcdir)/$(DOMAIN).pot || \
           test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
         @test ! -f $(srcdir)/$(DOMAIN).pot || { \
@@ -139,16 +137,8 @@ stamp-po: $(srcdir)/$(DOMAIN).pot
 
 # This target rebuilds $(DOMAIN).pot; it is an expensive operation.
 # Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
-# The determination of whether the package xyz is a GNU one is based on the
-# heuristic whether some file in the top level directory mentions "GNU xyz".
-# If GNU 'find' is available, we avoid grepping through monster files.
 $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
-        if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \
-               LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f -size -10000000c -exec grep 'GNU @PACKAGE@' /dev/null '{}' ';' 2>/dev/null; \
-             else \
-               LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \
-             fi; \
-           } | grep -v 'libtool:' >/dev/null; then \
+        if LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null | grep -v 'libtool:' >/dev/null; then \
           package_gnu='GNU '; \
         else \
           package_gnu=''; \