[gimp] po: only warn on pot generation.
- From: Jehan Pagès <jehanp src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] po: only warn on pot generation.
- Date: Mon, 3 Oct 2016 13:35:17 +0000 (UTC)
commit 20d45e5919d64f24b26603a070b7a21cbdd12cf5
Author: Jehan <jehan girinstud io>
Date: Mon Oct 3 15:28:18 2016 +0200
po: only warn on pot generation.
Commit c4bb708 was making `make check` fail. I should not return `false`
on the .pot file generation, simply warn. I explicitly fail the `make
update-po` command though when $(INTLTOOL_UPDATE) is the `true` command
because I know the message merge will fail and there won't be any proper
error message explaining why when it does.
po/Makefile.in.in | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 9add436..31defaa 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -98,9 +98,8 @@ all-no:
$(GETTEXT_PACKAGE).pot: $(POTFILES)
@if test "x$(INTLTOOL_UPDATE)" = "x/bin/true"; then \
- echo "Error: po generation deactivated on VPATH builds."; \
- echo " See commit c96006919."; \
- false; \
+ echo "Warning: pot generation deactivated on VPATH builds."; \
+ echo " See commit c96006919."; \
fi
$(GENPOT)
@@ -185,6 +184,11 @@ dist distdir: $(DISTFILES)
done
update-po: Makefile
+ @if test "x$(INTLTOOL_UPDATE)" = "x/bin/true"; then \
+ echo "Error: po generation deactivated on VPATH builds."; \
+ echo " See commit c96006919."; \
+ false; \
+ fi
$(MAKE) $(GETTEXT_PACKAGE).pot
tmpdir=`pwd`; \
linguas="$(USE_LINGUAS)"; \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]