diff options
| author | Michael Biebl <biebl@debian.org> | 2022-10-18 11:56:48 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2022-10-18 11:56:48 +0200 |
| commit | 9f101839d9e64df832e9e43c5181887369c46a7e (patch) | |
| tree | 3e23589a9d4e9e7c32ce41b634ccf26af3f0d45e /Makefile.in | |
| parent | ab0efddcdb48d800e2f938da54cfe3074640792e (diff) | |
New upstream version 1.40.2 upstream/1.40.2
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index d85cdccb..0813d5ba 100644 --- a/Makefile.in +++ b/Makefile.in @@ -4262,9 +4262,9 @@ CLEANFILES = $(introspection_sources) $(DBUS_INTERFACE_DOCS) \ cscope.po.out $(NULL) $(am__append_93) ############################################################################### -DISTCLEANFILES = config-extra.h $(polkit_policy_DATA) \ - src/libnm-client-impl/libnm.pc $(am__append_16) \ - $(am__append_17) $(am__append_53) +DISTCLEANFILES = config-extra.h po/.Makefile.patched \ + $(polkit_policy_DATA) src/libnm-client-impl/libnm.pc \ + $(am__append_16) $(am__append_17) $(am__append_53) ############################################################################### @@ -4667,6 +4667,7 @@ EXTRA_DIST = src/c-stdaux/src/c-stdaux.h $(NULL) \ 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 \ @@ -21043,6 +21044,20 @@ dist-configure-check: @echo "*** 'make dist' requires '--enable-gtk-doc --enable-introspection'. ***" @false +# 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" + +dist: po/.Makefile.patched + dist: $(dist_configure_check) $(dist_dependencies) ############################################################################### |