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