From: Ben Pfaff <blp@cs.stanford.edu>
Date: Sat, 20 Jun 2020 21:37:06 +0000 (+0000)
Subject: gui: Fix compatibility with older gettext.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29a50aeb6f35214d2affdec3bdb796f2d0e655ba;p=pspp

gui: Fix compatibility with older gettext.

Older gettext does not recognize the metainfo.xml extension, only
appdata.xml.  This commit allows msgfmt to work with such older setups.

CC: Friedrich Beckmann <friedrich.beckmann@gmx.de>
Fixes: 86c5d611b3f2 ("metainfo.xml: changed id to org.fsf.pspp, added more information")
---

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 9f2a20f9a7..382202cd7c 100644
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -378,7 +378,8 @@ PHONY += yelp-check
 AM_CPPFLAGS += -Isrc
 
 src/ui/gui/org.fsf.pspp.metainfo.xml: src/ui/gui/org.fsf.pspp.metainfo.xml.in $(POFILES)
-	$(AM_V_GEN)$(MSGFMT) --xml --template $< -o $@ -d $(top_srcdir)/po
+	$(AM_V_GEN)$(MSGFMT) --xml --template $< -o $@ -d $(top_srcdir)/po || \
+	  $(MSGFMT) -L appdata --xml --template $< -o $@ -d $(top_srcdir)/po
 
 src/ui/gui/org.fsf.pspp.desktop: src/ui/gui/org.fsf.pspp.desktop.in $(POFILES)
 	$(AM_V_GEN)$(MSGFMT) --desktop --template $< -o $@ -d $(top_srcdir)/po