1*4882a593SmuzhiyunFrom 85763549c53b2907dab094163f1404b2233f8029 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Adam Duskett <aduskett@gmail.com> 3*4882a593SmuzhiyunDate: Mon, 9 Oct 2017 16:51:20 -0400 4*4882a593SmuzhiyunSubject: [PATCH] Add DESTDIR to setfiles 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunThe addition of this patch makes the use of DESTDIR 7*4882a593Smuzhiyunmandatory as there are conditional checks which would fail if it's not 8*4882a593Smuzhiyundefined. 9*4882a593Smuzhiyun 10*4882a593SmuzhiyunThis patch was updated from the patch provided by Niranjan Reddy to 11*4882a593Smuzhiyunaccomodate version 2.5 12*4882a593Smuzhiyun 13*4882a593SmuzhiyunSigned-off-by: Clayton Shotwell <clayton.shotwell@rockwellcollins.com> 14*4882a593SmuzhiyunSigned-off-by: Niranjan Reddy <niranjan.reddy@rockwellcollins.com> 15*4882a593SmuzhiyunSigned-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 16*4882a593Smuzhiyun[Update for 2.8] 17*4882a593SmuzhiyunSigned-off-by: Adam Duskett <aduskett@gmail.com> 18*4882a593Smuzhiyun[Update for 3.2] 19*4882a593Smuzhiyun--- 20*4882a593Smuzhiyun setfiles/Makefile | 2 +- 21*4882a593Smuzhiyun 1 file changed, 1 insertion(+), 1 deletion(-) 22*4882a593Smuzhiyun 23*4882a593Smuzhiyundiff --git a/setfiles/Makefile b/setfiles/Makefile 24*4882a593Smuzhiyunindex a3bbbe1..df675cf 100644 25*4882a593Smuzhiyun--- a/setfiles/Makefile 26*4882a593Smuzhiyun+++ b/setfiles/Makefile 27*4882a593Smuzhiyun@@ -3,7 +3,7 @@ LINGUAS ?= ru 28*4882a593Smuzhiyun PREFIX ?= /usr 29*4882a593Smuzhiyun SBINDIR ?= /sbin 30*4882a593Smuzhiyun MANDIR = $(PREFIX)/share/man 31*4882a593Smuzhiyun-AUDITH ?= $(shell test -f /usr/include/libaudit.h && echo y) 32*4882a593Smuzhiyun+AUDITH ?= $(shell test -f $(DESTDIR)$(PREFIX)/include/libaudit.h && echo y) 33*4882a593Smuzhiyun 34*4882a593Smuzhiyun CFLAGS ?= -g -Werror -Wall -W 35*4882a593Smuzhiyun override LDLIBS += -lselinux -lsepol 36*4882a593Smuzhiyun-- 37*4882a593Smuzhiyun2.13.6 38*4882a593Smuzhiyun 39