From 30fd157a73f148dbc150c18b206b85e1a4a93e9c Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyfox@gentoo.org>
Date: Tue, 3 Mar 2020 09:26:12 +0000
Subject: [PATCH] misc/Makefile.am: install 'mc.lib' only once (#4070)
Before the change `mc.lib` was installed twice due to being
in two `_DATA` variables:
```
dist_pkgdata_DATA = \
mc.lib
pkgdata_DATA = \
$(dist_pkgdata_DATA) \
$(PKGDATA_OUT)
```
This causes occasional install failures when two parallel
`/usr/bin/install` calls race in installing the file:
```
$ make -j20 DESTDIR=/var/tmp/portage/app-misc/mc-4.8.24/image install
...
/usr/lib/portage/python3.6/ebuild-helpers/xattr/install \
-c -m 644 mc.lib '/var/tmp/portage/app-misc/mc-4.8.24/image/usr/share/mc'
/usr/lib/portage/python3.6/ebuild-helpers/xattr/install \
-c -m 644 mc.lib mc.charsets '/var/tmp/portage/app-misc/mc-4.8.24/image/usr/share/mc'
...
/usr/bin/install: cannot create regular file
'/var/tmp/portage/app-misc/mc-4.8.24/image/usr/share/mc/mc.lib': File exists
```
After the change `mc.lib` is present only in `dist_pkgdata_DATA`.
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
---
misc/Makefile.am | 2 --
1 file changed, 2 deletions(-)
diff --git a/misc/Makefile.am b/misc/Makefile.am
index 8ed182613..24f4a0e1a 100644
|
a
|
b
|
dist_pkgdata_DATA = \ |
| 17 | 17 | mc.lib |
| 18 | 18 | |
| 19 | 19 | pkgdata_DATA = \ |
| 20 | | $(dist_pkgdata_DATA) \ |
| 21 | 20 | $(PKGDATA_OUT) |
| 22 | 21 | |
| 23 | 22 | SCRIPTS_IN = \ |
| … |
… |
EXTRA_DIST = \ |
| 54 | 53 | $(LIBFILES_SCRIPT) \ |
| 55 | 54 | $(SCRIPTS_IN) \ |
| 56 | 55 | $(noinst_DATA) \ |
| 57 | | $(dist_pkgdata_DATA) \ |
| 58 | 56 | $(PKGDATA_IN) |
| 59 | 57 | |
| 60 | 58 | install-data-hook: |
