From 9f101839d9e64df832e9e43c5181887369c46a7e Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 18 Oct 2022 11:56:48 +0200 Subject: New upstream version 1.40.2 --- Makefile.am | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'Makefile.am') 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 \ -- cgit 1.3.0-6-gf8a5