* [PATCH] bash-completion: fix runuser install
@ 2014-10-24 16:12 Mike Frysinger
2014-10-24 16:26 ` [PATCH v2] " Mike Frysinger
0 siblings, 1 reply; 3+ messages in thread
From: Mike Frysinger @ 2014-10-24 16:12 UTC (permalink / raw)
To: util-linux
The runuser symlink used to depend on su being enabled, but a refactoring
broke that. So if you build with runuser enabled but not su, you end up
with a broken symlink. Rework the logic so it works in both cases.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
bash-completion/Makemodule.am | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/bash-completion/Makemodule.am b/bash-completion/Makemodule.am
index 271a6db..045c2d5 100644
--- a/bash-completion/Makemodule.am
+++ b/bash-completion/Makemodule.am
@@ -154,7 +154,11 @@ endif
if BUILD_RUNUSER
install-data-hook-bashcomp-runuser::
+if BUILD_SU
ln -sf su $(DESTDIR)$(bashcompletiondir)/runuser
+else
+ cp bash-completion/su $(DESTDIR)$(bashcompletiondir)/runuser
+endif
INSTALL_DATA_HOOKS += install-data-hook-bashcomp-runuser
endif
--
2.1.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH v2] bash-completion: fix runuser install
2014-10-24 16:12 [PATCH] bash-completion: fix runuser install Mike Frysinger
@ 2014-10-24 16:26 ` Mike Frysinger
2014-10-31 9:40 ` Karel Zak
0 siblings, 1 reply; 3+ messages in thread
From: Mike Frysinger @ 2014-10-24 16:26 UTC (permalink / raw)
To: util-linux
The runuser symlink used to depend on su being enabled, but a refactoring
broke that. So if you build with runuser enabled but not su, you end up
with a broken symlink. Rework the logic so it works in both cases.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
v2
- use srcdir to fix out-of-tree building
bash-completion/Makemodule.am | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/bash-completion/Makemodule.am b/bash-completion/Makemodule.am
index 271a6db..d65cc8f 100644
--- a/bash-completion/Makemodule.am
+++ b/bash-completion/Makemodule.am
@@ -154,7 +154,11 @@ endif
if BUILD_RUNUSER
install-data-hook-bashcomp-runuser::
+if BUILD_SU
ln -sf su $(DESTDIR)$(bashcompletiondir)/runuser
+else
+ cp $(top_srcdir)/bash-completion/su $(DESTDIR)$(bashcompletiondir)/runuser
+endif
INSTALL_DATA_HOOKS += install-data-hook-bashcomp-runuser
endif
--
2.1.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-10-31 9:40 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-24 16:12 [PATCH] bash-completion: fix runuser install Mike Frysinger
2014-10-24 16:26 ` [PATCH v2] " Mike Frysinger
2014-10-31 9:40 ` Karel Zak
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox