[beast: 3/4] MISC: Dockerfile-apt.in: disable check-update-po during docker distcheck
- From: Tim Janik <timj src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [beast: 3/4] MISC: Dockerfile-apt.in: disable check-update-po during docker distcheck
- Date: Fri, 16 Jun 2017 08:01:18 +0000 (UTC)
commit 5ca8e561d329fe3d7320102096de5d0e9abb01a7
Author: Tim Janik <timj gnu org>
Date: Fri Jun 16 01:57:25 2017 +0200
MISC: Dockerfile-apt.in: disable check-update-po during docker distcheck
Updated PO files are needed for releases and are enabled by default for
distcheck, but continuous integration builds including distcheck runs
should succeed without forcing update-po on every git push.
Signed-off-by: Tim Janik <timj gnu org>
Makefile.am | 3 ++-
misc/Dockerfile-apt.in | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index b2a3604..b6002e5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -136,7 +136,8 @@ distcheck: dist
.PHONY: distcheck distuninstallcheck-hook
# == distcheck-checks ==
+DISTCHECK_PO = 1
check-update-po:
- $(Q) $(MAKE) -C po check-update-po
+ $(Q) [ "$(DISTCHECK_PO)" = "0" ] || $(MAKE) -C po check-update-po
DISTCHECK_HOOK = distcheck # help add dependencies to 'distcheck' without overriding its definition
$(DISTCHECK_HOOK): check-update-po
diff --git a/misc/Dockerfile-apt.in b/misc/Dockerfile-apt.in
index 410763e..8c5538f 100644
--- a/misc/Dockerfile-apt.in
+++ b/misc/Dockerfile-apt.in
@@ -84,7 +84,7 @@ RUN nice make uninstall
# Carry out distcheck test if desired
RUN `intent distcheck` && \
- nice make distcheck
+ nice make distcheck DISTCHECK_PO=0
# Show tarball
RUN ls -l *.tar.xz
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]