1*4882a593SmuzhiyunFrom a221304344b3f9db7e86d928cf97d77542bcf456 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Adam Duskett <aduskett@gmail.com> 3*4882a593SmuzhiyunDate: Mon, 9 Oct 2017 16:47:19 -0400 4*4882a593SmuzhiyunSubject: [PATCH] Add PREFIX to host paths 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunUpdates the remaining hardcoded host paths used in the build to be 7*4882a593Smuzhiyunprefixed with a PREFIX path to allow cross compilation. 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunUpdated to work with version 3.2 10*4882a593Smuzhiyun 11*4882a593SmuzhiyunSigned-off-by: Clayton Shotwell <clayton.shotwell@rockwellcollins.com> 12*4882a593SmuzhiyunSigned-off-by: Niranjan Reddy <niranjan.reddy@rockwellcollins.com> 13*4882a593SmuzhiyunSigned-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 14*4882a593Smuzhiyun[Update for 2.8] 15*4882a593SmuzhiyunSigned-off-by: Adam Duskett <aduskett@gmail.com> 16*4882a593Smuzhiyun[Update for 3.2] 17*4882a593Smuzhiyun--- 18*4882a593Smuzhiyun newrole/Makefile | 4 ++-- 19*4882a593Smuzhiyun run_init/Makefile | 4 ++-- 20*4882a593Smuzhiyun 2 files changed, 4 insertions(+), 4 deletions(-) 21*4882a593Smuzhiyun 22*4882a593Smuzhiyundiff --git a/newrole/Makefile b/newrole/Makefile 23*4882a593Smuzhiyunindex 0e7ebce..3188cec 100644 24*4882a593Smuzhiyun--- a/newrole/Makefile 25*4882a593Smuzhiyun+++ b/newrole/Makefile 26*4882a593Smuzhiyun@@ -4,8 +4,8 @@ PREFIX ?= /usr 27*4882a593Smuzhiyun BINDIR ?= $(PREFIX)/bin 28*4882a593Smuzhiyun MANDIR ?= $(PREFIX)/share/man 29*4882a593Smuzhiyun ETCDIR ?= /etc 30*4882a593Smuzhiyun-LOCALEDIR = $(DESTDIR)$(PREFIX)/share/locale 31*4882a593Smuzhiyun-INCLUDEDIR ?= $(PREFIX)/include 32*4882a593Smuzhiyun+LOCALEDIR = $(DESTDIR)$(PREFIX) 33*4882a593Smuzhiyun+INCLUDEDIR ?= $(LOCALEDIR)/include 34*4882a593Smuzhiyun PAMH ?= $(shell test -f $(INCLUDEDIR)/security/pam_appl.h && echo y) 35*4882a593Smuzhiyun AUDITH ?= $(shell test -f $(INCLUDEDIR)/libaudit.h && echo y) 36*4882a593Smuzhiyun # Enable capabilities to permit newrole to generate audit records. 37*4882a593Smuzhiyundiff --git a/run_init/Makefile b/run_init/Makefile 38*4882a593Smuzhiyunindex e86364a..20a64d4 100644 39*4882a593Smuzhiyun--- a/run_init/Makefile 40*4882a593Smuzhiyun+++ b/run_init/Makefile 41*4882a593Smuzhiyun@@ -6,8 +6,8 @@ SBINDIR ?= $(PREFIX)/sbin 42*4882a593Smuzhiyun MANDIR ?= $(PREFIX)/share/man 43*4882a593Smuzhiyun ETCDIR ?= /etc 44*4882a593Smuzhiyun LOCALEDIR ?= $(DESTDIR)$(PREFIX)/share/locale 45*4882a593Smuzhiyun-PAMH ?= $(shell test -f /usr/include/security/pam_appl.h && echo y) 46*4882a593Smuzhiyun-AUDITH ?= $(shell test -f /usr/include/libaudit.h && echo y) 47*4882a593Smuzhiyun+PAMH ?= $(shell test -f $(DESTDIR)$(PREFIX)/include/security/pam_appl.h && echo y) 48*4882a593Smuzhiyun+AUDITH ?= $(shell test -f $(DESTDIR)$(PREFIX)/include/libaudit.h && echo y) 49*4882a593Smuzhiyun 50*4882a593Smuzhiyun CFLAGS ?= -Werror -Wall -W 51*4882a593Smuzhiyun override CFLAGS += -DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\"" 52*4882a593Smuzhiyun-- 53*4882a593Smuzhiyun2.31.1 54*4882a593Smuzhiyun 55