0001-Add-DESTDIR-to-all-paths-that-use-an-absolute-path.patch 1.2 KB

12345678910111213141516171819202122232425262728293031323334353637
  1. From 85763549c53b2907dab094163f1404b2233f8029 Mon Sep 17 00:00:00 2001
  2. From: Adam Duskett <aduskett@gmail.com>
  3. Date: Mon, 9 Oct 2017 16:51:20 -0400
  4. Subject: [PATCH] Add DESTDIR to setfiles
  5. The addition of this patch makes the use of DESTDIR
  6. mandatory as there are conditional checks which would fail if it's not
  7. defined.
  8. This patch was updated from the patch provided by Niranjan Reddy to
  9. accomodate version 2.5
  10. Signed-off-by: Clayton Shotwell <clayton.shotwell@rockwellcollins.com>
  11. Signed-off-by: Niranjan Reddy <niranjan.reddy@rockwellcollins.com>
  12. Signed-off-by: Adam Duskett <aduskett@gmail.com>
  13. Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  14. [Update for 2.8]
  15. ---
  16. setfiles/Makefile | 2 +-
  17. 1 file changed, 1 insertion(+), 1 deletion(-)
  18. diff --git a/setfiles/Makefile b/setfiles/Makefile
  19. index c08e2dd..36c0638 100644
  20. --- a/setfiles/Makefile
  21. +++ b/setfiles/Makefile
  22. @@ -3,7 +3,7 @@ PREFIX ?= $(DESTDIR)/usr
  23. PREFIX ?= /usr
  24. SBINDIR ?= /sbin
  25. MANDIR = $(PREFIX)/share/man
  26. -AUDITH ?= $(shell test -f /usr/include/libaudit.h && echo y)
  27. +AUDITH ?= $(shell test -f $(DESTDIR)$(PREFIX)/include/libaudit.h && echo y)
  28. ABORT_ON_ERRORS=$(shell grep "^\#define ABORT_ON_ERRORS" setfiles.c | awk -S '{ print $$3 }')
  29. --
  30. 2.13.6