From: Friedrich Beckmann Date: Sat, 5 Sep 2020 15:17:07 +0000 (+0200) Subject: Revert "Work around bug in xgettext 0.19.8.1" X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp;a=commitdiff_plain;h=01823fe3340ba68bc8a1a938ad00c57fde72cb96 Revert "Work around bug in xgettext 0.19.8.1" This reverts commit df9ada336f1373c1144b7133a78c97ef5e7afdc3. --- diff --git a/po/automake.mk b/po/automake.mk index 7bf177b63d..594d35e14f 100644 --- a/po/automake.mk +++ b/po/automake.mk @@ -64,10 +64,7 @@ $(POTFILE): $(ALL_TRANSLATABLE_FILES) Makefile @$(MKDIR_P) po $(AM_V_GEN)$(XGETTEXT) $(XGETTEXT_OPTIONS) $(TRANSLATABLE_FILES) --language=C --keyword=_ --keyword=N_ -o $@,tmp $(AM_V_at)$(XGETTEXT) $(XGETTEXT_OPTIONS) -j $(UI_FILES) --language=Glade -o $@,tmp - ## xgettext 0.19.8.1 is known to crash on exit on the following command. - ## See https://git.savannah.gnu.org/gitweb/?p=gettext.git;a=commitdiff;h=a0cab233 - ## Therefore we ignore the exit status - $(AM_V_at)$(XGETTEXT) $(XGETTEXT_OPTIONS) --its=$(top_srcdir)/po/metainfo.its -j src/ui/gui/org.fsf.pspp.metainfo.xml.in -o $@,tmp || true + $(AM_V_at)$(XGETTEXT) $(XGETTEXT_OPTIONS) --its=$(top_srcdir)/po/metainfo.its -j src/ui/gui/org.fsf.pspp.metainfo.xml.in -o $@,tmp $(AM_V_at)$(XGETTEXT) $(XGETTEXT_OPTIONS) -j src/ui/gui/org.fsf.pspp.desktop.in -o $@,tmp $(AM_V_at)$(SED) -e '/^"POT-Creation-Date: .*/d' $@,tmp > $@