diff options
| author | Stephen Smalley <sds@tycho.nsa.gov> | 2017-06-20 10:49:57 -0400 |
|---|---|---|
| committer | Stephen Smalley <sds@tycho.nsa.gov> | 2017-06-20 12:18:26 -0400 |
| commit | 7b5699bfd77d4581c6a52687ba2e3cf911348b8f (patch) | |
| tree | f2c8e93287e70b2a7214077f47c71939e4c501b9 /policycoreutils/load_policy/Makefile | |
| parent | 15f27407332268104a411241be33f0cc2c4af2e0 (diff) | |
| download | android_external_selinux-7b5699bfd77d4581c6a52687ba2e3cf911348b8f.tar.gz android_external_selinux-7b5699bfd77d4581c6a52687ba2e3cf911348b8f.tar.bz2 android_external_selinux-7b5699bfd77d4581c6a52687ba2e3cf911348b8f.zip | |
Fix BINDIR/SBINDIR/... variables in Makefiles
As reported by Nicolas Iooss, there are still some inconsistencies
in the definitions and usage of Makefile variables related to bin
and sbin directories. Since we need to still support non-usrmerge
systems, we cannot completely synchronize them, but we can eliminate
unnecessary differences, remove unused variables, and drop the
USRSBINDIR variables.
Before:
$ find . -name Makefile -exec cat {} + |grep '^[A-Z_]*BINDIR' |sort -u
BINDIR=$(PREFIX)/bin
BINDIR ?= $(PREFIX)/bin
BINDIR ?= $(PREFIX)/sbin
SBINDIR ?= $(DESTDIR)/sbin
SBINDIR ?= $(PREFIX)/sbin
USRSBINDIR ?= $(PREFIX)/sbin
After:
$ find . -name Makefile -exec cat {} + | grep '^[A-Z_]*BINDIR' | sort -u
BINDIR ?= $(PREFIX)/bin
SBINDIR ?= $(DESTDIR)/sbin
SBINDIR ?= $(PREFIX)/sbin
This does not change the actual install location of any file.
It does drop the legacy symlink from /usr/sbin/load_policy to
/sbin/load_policy; packagers can create that separately if
desired.
Reported-by: Nicolas Iooss <nicolas.iooss@m4x.org>
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Diffstat (limited to 'policycoreutils/load_policy/Makefile')
| -rw-r--r-- | policycoreutils/load_policy/Makefile | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/policycoreutils/load_policy/Makefile b/policycoreutils/load_policy/Makefile index 8ee1fb16..b85833c2 100644 --- a/policycoreutils/load_policy/Makefile +++ b/policycoreutils/load_policy/Makefile @@ -1,7 +1,6 @@ # Installation directories. PREFIX ?= $(DESTDIR)/usr SBINDIR ?= $(DESTDIR)/sbin -USRSBINDIR ?= $(PREFIX)/sbin MANDIR ?= $(PREFIX)/share/man LOCALEDIR ?= /usr/share/locale @@ -18,8 +17,6 @@ install: all install -m 755 $(TARGETS) $(SBINDIR) test -d $(MANDIR)/man8 || install -m 755 -d $(MANDIR)/man8 install -m 644 load_policy.8 $(MANDIR)/man8/ - -mkdir -p $(USRSBINDIR) - -ln -sf $(SBINDIR)/load_policy $(USRSBINDIR)/load_policy clean: -rm -f $(TARGETS) *.o |