mirrors/apparmor
1
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor.git synced 2025-03-04 08:24:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge utils: allow install locations to be overridden in Makefile

Browse source 
Instead of setting those variables unconditionally, set them if they
aren't externally set by environment variables. This will allow for usages
like DESTDIR=/some/other/dir make install in the utils directory.

Signed-off-by: Ryan Lee <ryan.lee@canonical.com>

MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/1542
Approved-by: John Johansen <john@jjmx.net>
Merged-by: John Johansen <john@jjmx.net>
This commit is contained in:
John Johansen 2025-02-13 21:52:04 +00:00
commit 49bc2d855f
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
utils/Makefile
View file

@ -39,10 +39,10 @@ all: docs
docs: ${MANPAGES} ${HTMLMANPAGES} docs: ${MANPAGES} ${HTMLMANPAGES}
# need some better way of determining this # need some better way of determining this
DESTDIR=/ DESTDIR?=/
BINDIR=${DESTDIR}/usr/sbin BINDIR?=${DESTDIR}/usr/sbin
CONFDIR=${DESTDIR}/etc/apparmor CONFDIR?=${DESTDIR}/etc/apparmor
PYPREFIX=/usr PYPREFIX?=/usr
po/${NAME}.pot: ${TOOLS} ${PYMODULES} po/${NAME}.pot: ${TOOLS} ${PYMODULES}