mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-28 13:46:32 +00:00
package/bash-completion: fix a parallel build issue
The STAGING_DIR/usr/share/bash-completion/completions directory is not
created yet.
Fixed by:
ee6b37ad7f
Fixes:
http://autobuild.buildroot.org/results/7ee/7eea0f512695605714cf2d8c971778d4784b4c75/build-end.log
Signed-off-by: Romain Naour <romain.naour@smile.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
parent
2c57dc0469
commit
f1755c8784
@ -0,0 +1,35 @@
|
|||||||
|
From f9a1dfe7a3d0f35474b3f4ded05e3d97be5017bf Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
|
||||||
|
Date: Fri, 25 May 2018 17:38:59 +0200
|
||||||
|
Subject: [PATCH] completions/Makefile.am: Use install-data-hook, not
|
||||||
|
install-data-local
|
||||||
|
|
||||||
|
-hook is run after the main rule, while -local might end up before.
|
||||||
|
https://www.gnu.org/software/automake/manual/html_node/Extending.html#index-hook-targets
|
||||||
|
|
||||||
|
Closes #212
|
||||||
|
|
||||||
|
[backported from ee6b37ad7ff5b309cbb9b886a871252abd9398fa]
|
||||||
|
Signed-off-by: Romain Naour <romain.naour@smile.fr>
|
||||||
|
---
|
||||||
|
completions/Makefile.am | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/completions/Makefile.am b/completions/Makefile.am
|
||||||
|
index e442a9e..5c49796 100644
|
||||||
|
--- a/completions/Makefile.am
|
||||||
|
+++ b/completions/Makefile.am
|
||||||
|
@@ -993,8 +993,8 @@ symlinks: $(targetdir) $(DATA)
|
||||||
|
all-local: targetdir = .
|
||||||
|
all-local: symlinks
|
||||||
|
|
||||||
|
-install-data-local: targetdir = $(DESTDIR)$(bashcompdir)
|
||||||
|
-install-data-local: symlinks
|
||||||
|
+install-data-hook: targetdir = $(DESTDIR)$(bashcompdir)
|
||||||
|
+install-data-hook: symlinks
|
||||||
|
|
||||||
|
check-local:
|
||||||
|
ret=0
|
||||||
|
--
|
||||||
|
2.7.4
|
||||||
|
|
@ -10,6 +10,9 @@ BASH_COMPLETION_SOURCE = bash-completion-$(BASH_COMPLETION_VERSION).tar.xz
|
|||||||
BASH_COMPLETION_LICENSE = GPL-2.0
|
BASH_COMPLETION_LICENSE = GPL-2.0
|
||||||
BASH_COMPLETION_LICENSE_FILES = COPYING
|
BASH_COMPLETION_LICENSE_FILES = COPYING
|
||||||
|
|
||||||
|
# 0001-completions-Makefile.am-Use-install-data-hook-not-in.patch
|
||||||
|
BASH_COMPLETION_AUTORECONF = YES
|
||||||
|
|
||||||
# Install bash-completion.pc file
|
# Install bash-completion.pc file
|
||||||
BASH_COMPLETION_INSTALL_STAGING = YES
|
BASH_COMPLETION_INSTALL_STAGING = YES
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user