| Andrew Geissler | 59125e0 | 2021-07-23 12:56:22 -0400 | [diff] [blame] | 1 | From 363114dcd72abf1c0dcd637c66037227b8be229b Mon Sep 17 00:00:00 2001 |
| 2 | From: Yi Zhao <yi.zhao@windriver.com> |
| 3 | Date: Mon, 21 Jun 2021 14:18:30 +0800 |
| 4 | Subject: [PATCH 1/2] Makefile: fix hardcoded installation directories |
| 5 | |
| 6 | Update the installation directories to fix the do_install error for |
| 7 | multilib and usrmerge. |
| 8 | |
| 9 | Upstream-Status: Inappropriate [configuration] |
| 10 | |
| 11 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> |
| 12 | --- |
| 13 | changehat/pam_apparmor/Makefile | 2 +- |
| 14 | parser/Makefile | 8 ++++---- |
| 15 | 2 files changed, 5 insertions(+), 5 deletions(-) |
| 16 | |
| 17 | diff --git a/changehat/pam_apparmor/Makefile b/changehat/pam_apparmor/Makefile |
| 18 | index f6ece2d1..0143ae9f 100644 |
| 19 | --- a/changehat/pam_apparmor/Makefile |
| 20 | +++ b/changehat/pam_apparmor/Makefile |
| 21 | @@ -77,7 +77,7 @@ $(NAME).so: ${OBJECTS} |
| 22 | |
| 23 | # need some better way of determining this |
| 24 | DESTDIR=/ |
| 25 | -SECDIR ?= ${DESTDIR}/lib/security |
| 26 | +SECDIR ?= ${DESTDIR}/${base_libdir}/security |
| 27 | |
| 28 | .PHONY: install |
| 29 | install: $(NAME).so |
| 30 | diff --git a/parser/Makefile b/parser/Makefile |
| 31 | index 8250ac45..cf18bc11 100644 |
| 32 | --- a/parser/Makefile |
| 33 | +++ b/parser/Makefile |
| 34 | @@ -23,10 +23,10 @@ COMMONDIR=../common/ |
| 35 | include $(COMMONDIR)/Make.rules |
| 36 | |
| 37 | DESTDIR=/ |
| 38 | -APPARMOR_BIN_PREFIX=${DESTDIR}/lib/apparmor |
| 39 | -SBINDIR=${DESTDIR}/sbin |
| 40 | -USR_SBINDIR=${DESTDIR}/usr/sbin |
| 41 | -SYSTEMD_UNIT_DIR=${DESTDIR}/usr/lib/systemd/system |
| 42 | +APPARMOR_BIN_PREFIX=${DESTDIR}/${nonarch_base_libdir}/apparmor |
| 43 | +SBINDIR=${DESTDIR}/${base_sbindir} |
| 44 | +USR_SBINDIR=${DESTDIR}/${sbindir} |
| 45 | +SYSTEMD_UNIT_DIR=${DESTDIR}/${systemd_system_unitdir} |
| 46 | CONFDIR=/etc/apparmor |
| 47 | INSTALL_CONFDIR=${DESTDIR}${CONFDIR} |
| 48 | LOCALEDIR=/usr/share/locale |
| 49 | -- |
| 50 | 2.17.1 |
| 51 | |