-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 This patch looks good to me. acked. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk9x2roACgkQrlYvE4MpobO0wACfaroRJxXDBnLAqKcBDpuqbRUS 5kYAoNEzRBop95XGJN3HWf6QZSlKrivk =Hy/N -----END PGP SIGNATURE-----
>From f5fe2a9a96c03a1bc804b89b5358a30c70b17f2f Mon Sep 17 00:00:00 2001 From: Dan Walsh <dwalsh@xxxxxxxxxx> Date: Fri, 27 Jan 2012 14:01:00 -0500 Subject: [PATCH 35/73] policycoreutils: scripts: Update Makefiles to handle /usrmove Move everything into /usr/* and just put links from /*. The whole /usr thing hasn't really worked in all situations for a long long time. Just accept that fact and move along. Signed-off-by: Eric Paris <eparis@xxxxxxxxxx> --- policycoreutils/scripts/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/policycoreutils/scripts/Makefile b/policycoreutils/scripts/Makefile index 17ad6ca..fe6427c 100644 --- a/policycoreutils/scripts/Makefile +++ b/policycoreutils/scripts/Makefile @@ -1,7 +1,8 @@ # Installation directories. PREFIX ?= $(DESTDIR)/usr BINDIR ?= $(PREFIX)/bin -SBINDIR ?= $(PREFIX)/sbin +USRSBINDIR ?= $(PREFIX)/sbin +SBINDIR ?= $(DESTDIR)/sbin MANDIR ?= $(PREFIX)/share/man LOCALEDIR ?= /usr/share/locale @@ -10,8 +11,8 @@ all: fixfiles genhomedircon chcat install: all -mkdir -p $(BINDIR) install -m 755 chcat $(BINDIR) - install -m 755 fixfiles $(DESTDIR)/sbin - install -m 755 genhomedircon $(SBINDIR) + install -m 755 fixfiles $(SBINDIR) + install -m 755 genhomedircon $(USRSBINDIR) -mkdir -p $(MANDIR)/man8 install -m 644 fixfiles.8 $(MANDIR)/man8/ install -m 644 genhomedircon.8 $(MANDIR)/man8/ -- 1.7.9.3
