diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2022-06-20 12:16:38 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2022-06-27 13:40:09 +0200 |
| commit | 978d8eb6992399648c34152a7a4657d64e0e0050 (patch) | |
| tree | 3481fabdbbd37be93006772b3153889b3d1da7a0 | |
| parent | 19a6affd3ad40ce7fd7ca6201f20ddd89e99949a (diff) | |
| download | NetworkManager-978d8eb6992399648c34152a7a4657d64e0e0050.tar.gz | |
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
| -rwxr-xr-x | .gitlab-ci/run-test.sh | 3 | ||||
| -rw-r--r-- | po/Makevars | 2 |
2 files changed, 4 insertions, 1 deletions
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 |