From: Bruno Haible Date: Tue, 14 Apr 2020 01:29:58 +0000 (+0200) Subject: build: Fix the generation of hello-c-gnome3.pot (regression from 2019-10-04). X-Git-Tag: v0.20.2~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02564345df002589896ab28e414411ff803370a3;p=thirdparty%2Fgettext.git build: Fix the generation of hello-c-gnome3.pot (regression from 2019-10-04). * gettext-tools/examples/po/Makefile.am (USE_BUILT_PROGS): Set also GETTEXTDATADIR. --- diff --git a/gettext-tools/examples/po/Makefile.am b/gettext-tools/examples/po/Makefile.am index 8a929f6e0..bf2027fa4 100644 --- a/gettext-tools/examples/po/Makefile.am +++ b/gettext-tools/examples/po/Makefile.am @@ -1,5 +1,5 @@ ## Makefile for the gettext-tools/examples/po subdirectory of GNU gettext -## Copyright (C) 1995-1998, 2000-2007, 2009, 2014, 2018-2019 Free Software Foundation, +## Copyright (C) 1995-1998, 2000-2007, 2009, 2014, 2018-2020 Free Software Foundation, ## Inc. ## ## This program is free software: you can redistribute it and/or modify @@ -234,9 +234,12 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) $(SMALLPOTS) remove-potcdate.sed # Make sure that xsmallpot.sh and mmsmallpo.sh uses the programs (autopoint, # xgettext, msgmerge, msgattrib...) built from source here. +# The environment variable 'gettext_datadir' is used by autopoint. +# The environment variable 'GETTEXTDATADIR' is used by xgettext. USE_BUILT_PROGS = \ PATH="`pwd`/../../src:`pwd`/../../misc:$$PATH"; \ - gettext_datadir="`pwd`/../../misc"; export gettext_datadir; + gettext_datadir="`pwd`/../../misc"; export gettext_datadir; \ + GETTEXTDATADIR="`cd '$(srcdir)/../..' && pwd`"; export GETTEXTDATADIR; hello-c.pot : $(POTFILES_DEPS) $(USE_BUILT_PROGS) $(SHELL) '$(srcdir)/xsmallpot.sh' '$(srcdir)' hello-c