-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 This patch looks good to me. acked. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.15 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iEYEARECAAYFAlJpM9kACgkQrlYvE4MpobM7ygCfVofRBzYgCWphtvQjHMralZ8B ca8An3J4HQJrOGz4IqXYqVY0kxCF1urP =sSyn -----END PGP SIGNATURE-----
>From 37e50aa505f5e4485fbb35ee44742deaf29dc6b5 Mon Sep 17 00:00:00 2001 From: Dan Walsh <dwalsh@xxxxxxxxxx> Date: Fri, 11 Oct 2013 08:33:47 -0400 Subject: [PATCH 41/74] bash completsion scripts have moved. This patch moves the semanage bash completion script to the new location. --- policycoreutils/semanage/Makefile | 4 ++-- policycoreutils/sepolicy/Makefile | 2 +- policycoreutils/setsebool/Makefile | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/policycoreutils/semanage/Makefile b/policycoreutils/semanage/Makefile index 24d6a21..b797d83 100644 --- a/policycoreutils/semanage/Makefile +++ b/policycoreutils/semanage/Makefile @@ -5,7 +5,7 @@ SBINDIR ?= $(PREFIX)/sbin MANDIR = $(PREFIX)/share/man PYLIBVER ?= $(shell python -c 'import sys;print "python%d.%d" % sys.version_info[0:2]') PYTHONLIBDIR ?= $(LIBDIR)/$(PYLIBVER) -BASHCOMPLETIONDIR ?= $(DESTDIR)/etc/bash_completion.d/ +BASHCOMPLETIONDIR ?= $(DESTDIR)/usr/share/bash-completion/completions TARGETS=semanage @@ -21,7 +21,7 @@ install: all test -d $(PYTHONLIBDIR)/site-packages || install -m 755 -d $(PYTHONLIBDIR)/site-packages install -m 755 seobject.py $(PYTHONLIBDIR)/site-packages -mkdir -p $(BASHCOMPLETIONDIR) - install -m 644 $(BASHCOMPLETIONS) $(BASHCOMPLETIONDIR) + install -m 644 $(BASHCOMPLETIONS) $(BASHCOMPLETIONDIR)/semanage clean: diff --git a/policycoreutils/sepolicy/Makefile b/policycoreutils/sepolicy/Makefile index 11b534f..af90c04 100644 --- a/policycoreutils/sepolicy/Makefile +++ b/policycoreutils/sepolicy/Makefile @@ -11,7 +11,7 @@ BASHCOMPLETIONDIR ?= $(DESTDIR)/etc/bash_completion.d/ SHAREDIR ?= $(PREFIX)/share/sandbox override CFLAGS = $(LDFLAGS) -I$(PREFIX)/include -DPACKAGE="policycoreutils" -Wall -Werror -Wextra -W -DSHARED -shared -BASHCOMPLETIONS=sepolicy-bash-completion.sh +BASHCOMPLETIONS=sepolicy-bash-completion.sh all: python-build diff --git a/policycoreutils/setsebool/Makefile b/policycoreutils/setsebool/Makefile index a6addc5..45d6538 100644 --- a/policycoreutils/setsebool/Makefile +++ b/policycoreutils/setsebool/Makefile @@ -4,7 +4,7 @@ INCLUDEDIR ?= $(PREFIX)/include SBINDIR ?= $(PREFIX)/sbin MANDIR = $(PREFIX)/share/man LIBDIR ?= $(PREFIX)/lib -BASHCOMPLETIONDIR ?= $(DESTDIR)/etc/bash_completion.d/ +BASHCOMPLETIONDIR ?= $(DESTDIR)/usr/share/bash-completion/completions CFLAGS ?= -Werror -Wall -W override CFLAGS += -I$(INCLUDEDIR) @@ -23,7 +23,7 @@ install: all -mkdir -p $(MANDIR)/man8 install -m 644 setsebool.8 $(MANDIR)/man8/ -mkdir -p $(BASHCOMPLETIONDIR) - install -m 644 $(BASHCOMPLETIONS) $(BASHCOMPLETIONDIR) + install -m 644 $(BASHCOMPLETIONS) $(BASHCOMPLETIONDIR)/setsebool relabel: -- 1.8.3.1
