diff options
| author | Michael Biebl <biebl@debian.org> | 2022-10-18 11:57:57 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2022-10-18 11:57:57 +0200 |
| commit | ac9380934a9c532c14422ee15b4869b2d5da14af (patch) | |
| tree | b5d020e8e72a2f3129c9ab0b311fd18c2a54918e /Makefile.am | |
| parent | 87f7575d7268053774dacffc4bdd45df3f26b30b (diff) | |
| parent | 9f101839d9e64df832e9e43c5181887369c46a7e (diff) | |
Update upstream source from tag 'upstream/1.40.2'
Update to upstream version '1.40.2' with Debian dir 1072992b4531d6c782ca5c453f83a2df3ad6390a
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 109326c3..05b5ffc9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -168,6 +168,22 @@ if !BUILD_DOCS dist_configure_check += dist-configure-check endif +# Gettext's Makefile has a race with parallel builds during dist. +# Hack around that. +# See also: +# https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1094#note_1435313 +# https://lists.gnu.org/archive/html/bug-gettext/2022-06/msg00022.html +# https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1405 +po/.Makefile.patched: + sed -i \ + 's#^dist2: \$$(srcdir)/stamp-po \$$(DISTFILES)#dist2: \$$(srcdir)/stamp-po\n\t\$$(MAKE) \$$(DISTFILES)#' \ + "$(builddir)/po/Makefile" && \ + touch "$(builddir)/po/.Makefile.patched" + +DISTCLEANFILES += po/.Makefile.patched + +dist: po/.Makefile.patched + dist: $(dist_configure_check) $(dist_dependencies) ############################################################################### @@ -3433,6 +3449,7 @@ EXTRA_DIST += \ src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft \ src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-infiniband \ src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ip6-disabled.cexpected \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ipoib \ src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-link_local \ src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-minimal \ src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-misc-variables \ |