From 7c86a2acaf33ac9abd5548216e49dcfd3eb6196c Mon Sep 17 00:00:00 2001 From: Rasmus Thomsen Date: Tue, 1 May 2018 00:22:45 +0200 Subject: [PATCH] parser: allow using a custom sbin & usr/sbin dir This is especially handy if your distro doesn't split sbin and bin and only wants to install into bin (so that the sbin directory doesn't clash with the sbin -> bin symlink) [Per feedback, added USR_SBINDIR as a toggle for the install location of aa-teardown -- @smb] Signed-off-by: Rasmus Thomsen Signed-off-by: Steve Beattie PR: https://gitlab.com/apparmor/apparmor/merge_requests/111/ --- parser/Makefile | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/parser/Makefile b/parser/Makefile index 04996fb7b..0cde1296f 100644 --- a/parser/Makefile +++ b/parser/Makefile @@ -24,6 +24,8 @@ include $(COMMONDIR)/Make.rules DESTDIR=/ APPARMOR_BIN_PREFIX=${DESTDIR}/lib/apparmor +SBINDIR=${DESTDIR}/sbin +USR_SBINDIR=${DESTDIR}/usr/sbin SYSTEMD_UNIT_DIR=${DESTDIR}/usr/lib/systemd/system CONFDIR=/etc/apparmor INSTALL_CONFDIR=${DESTDIR}${CONFDIR} @@ -318,8 +320,8 @@ install-redhat: .PHONY: install-suse install-suse: install-systemd - install -m 755 -d $(DESTDIR)/sbin - ln -sf service $(DESTDIR)/sbin/rcapparmor + install -m 755 -d $(SBINDIR) + ln -sf service $(SBINDIR)/rcapparmor .PHONY: install-slackware install-slackware: @@ -365,8 +367,8 @@ install: install-indep install-arch .PHONY: install-arch install-arch: $(INSTALLDEPS) - install -m 755 -d $(DESTDIR)/sbin - install -m 755 ${TOOLS} $(DESTDIR)/sbin + install -m 755 -d $(SBINDIR) + install -m 755 ${TOOLS} $(SBINDIR) .PHONY: install-indep install-indep: indep @@ -384,8 +386,8 @@ install-systemd: install -m 755 -d $(SYSTEMD_UNIT_DIR) install -m 644 apparmor.service $(SYSTEMD_UNIT_DIR) install -m 755 apparmor.systemd $(APPARMOR_BIN_PREFIX) - install -m 755 -d $(DESTDIR)/usr/sbin - install -m 755 aa-teardown $(DESTDIR)/usr/sbin + install -m 755 -d $(USR_SBINDIR) + install -m 755 aa-teardown $(USR_SBINDIR) ifndef VERBOSE .SILENT: clean