From 1f2a965a2a594eafe5d02caf0e5a8db3caabf0fb Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Mon, 20 Jun 2022 12:16:38 +0200 Subject: [PATCH] po: make dist depend on update-po This works around a race condition with gettext Makefile. https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1094#note_1435313 --- .gitlab-ci/run-test.sh | 3 +++ po/Makevars | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci/run-test.sh b/.gitlab-ci/run-test.sh index be725133f6..0e2f3f52ef 100755 --- a/.gitlab-ci/run-test.sh +++ b/.gitlab-ci/run-test.sh @@ -20,6 +20,9 @@ fi do_clean() { git clean -fdx + # "make -C update-po", run on "make dist" has a silly habit of + # modifying files in-tree. Lets undo that. + git checkout -- po/ } uname -a diff --git a/po/Makevars b/po/Makevars index b858b6db7d..ebd690f6bd 100644 --- a/po/Makevars +++ b/po/Makevars @@ -75,4 +75,4 @@ PO_DEPENDS_ON_POT = no # regenerate PO files on "make dist". Possible values are "yes" and # "no". Set this to no if the POT file and PO files are maintained # externally. -DIST_DEPENDS_ON_UPDATE_PO = no +DIST_DEPENDS_ON_UPDATE_PO = yes