public inbox for util-linux@vger.kernel.org
 help / color / mirror / Atom feed
From: Mike Frysinger <vapier@gentoo.org>
To: util-linux@vger.kernel.org
Subject: [PATCH v2] bash-completion: fix runuser install
Date: Fri, 24 Oct 2014 12:26:12 -0400	[thread overview]
Message-ID: <1414167972-16829-1-git-send-email-vapier@gentoo.org> (raw)
In-Reply-To: <1414167178-29409-1-git-send-email-vapier@gentoo.org>

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


  reply	other threads:[~2014-10-24 16:26 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-24 16:12 [PATCH] bash-completion: fix runuser install Mike Frysinger
2014-10-24 16:26 ` Mike Frysinger [this message]
2014-10-31  9:40   ` [PATCH v2] " Karel Zak

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1414167972-16829-1-git-send-email-vapier@gentoo.org \
    --to=vapier@gentoo.org \
    --cc=util-linux@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox