mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-09-01 06:45:38 +00:00
Code Issues Releases Wiki Activity

parser: allow using a custom sbin & usr/sbin dir

Browse Source 
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 <cogitri@exherbo.org>
Signed-off-by: Steve Beattie <steve.beattie@canonical.com>
PR: https://gitlab.com/apparmor/apparmor/merge_requests/111/
This commit is contained in:
Rasmus Thomsen
2018-05-01 00:22:45 +02:00
committed by Steve Beattie
parent 6a2b90ba56
commit 7c86a2acaf
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
parser/Makefile
View File

@@ -24,6 +24,8 @@ include $(COMMONDIR)/Make.rules
DESTDIR=/ DESTDIR=/
APPARMOR_BIN_PREFIX=${DESTDIR}/lib/apparmor APPARMOR_BIN_PREFIX=${DESTDIR}/lib/apparmor
SBINDIR=${DESTDIR}/sbin
USR_SBINDIR=${DESTDIR}/usr/sbin
SYSTEMD_UNIT_DIR=${DESTDIR}/usr/lib/systemd/system SYSTEMD_UNIT_DIR=${DESTDIR}/usr/lib/systemd/system
CONFDIR=/etc/apparmor CONFDIR=/etc/apparmor
INSTALL_CONFDIR=${DESTDIR}${CONFDIR} INSTALL_CONFDIR=${DESTDIR}${CONFDIR}
@@ -318,8 +320,8 @@ install-redhat:
.PHONY: install-suse .PHONY: install-suse
install-suse: install-systemd install-suse: install-systemd
install -m 755 -d $(DESTDIR)/sbin install -m 755 -d $(SBINDIR)
ln -sf service $(DESTDIR)/sbin/rcapparmor ln -sf service $(SBINDIR)/rcapparmor
.PHONY: install-slackware .PHONY: install-slackware
install-slackware: install-slackware:
@@ -365,8 +367,8 @@ install: install-indep install-arch
.PHONY: install-arch .PHONY: install-arch
install-arch: $(INSTALLDEPS) install-arch: $(INSTALLDEPS)
install -m 755 -d $(DESTDIR)/sbin install -m 755 -d $(SBINDIR)
install -m 755 ${TOOLS} $(DESTDIR)/sbin install -m 755 ${TOOLS} $(SBINDIR)
.PHONY: install-indep .PHONY: install-indep
install-indep: indep install-indep: indep
@@ -384,8 +386,8 @@ install-systemd:
install -m 755 -d $(SYSTEMD_UNIT_DIR) install -m 755 -d $(SYSTEMD_UNIT_DIR)
install -m 644 apparmor.service $(SYSTEMD_UNIT_DIR) install -m 644 apparmor.service $(SYSTEMD_UNIT_DIR)
install -m 755 apparmor.systemd $(APPARMOR_BIN_PREFIX) install -m 755 apparmor.systemd $(APPARMOR_BIN_PREFIX)
install -m 755 -d $(DESTDIR)/usr/sbin install -m 755 -d $(USR_SBINDIR)
install -m 755 aa-teardown $(DESTDIR)/usr/sbin install -m 755 aa-teardown $(USR_SBINDIR)
ifndef VERBOSE ifndef VERBOSE
.SILENT: clean .SILENT: clean