|
 |
4c0d37 |
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
4c0d37 |
From: Peter Jones <pjones@redhat.com>
|
|
|
4c0d37 |
Date: Fri, 25 Oct 2019 15:39:35 -0400
|
|
|
4c0d37 |
Subject: [PATCH] Make: make "make DESTDIR=../foo install" work right.
|
|
|
4c0d37 |
|
|
|
4c0d37 |
This makes the normal DESTDIR= variable work on the command line, and
|
|
|
4c0d37 |
makes relative paths always relative to the top-level directory.
|
|
|
4c0d37 |
|
|
|
4c0d37 |
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
|
4c0d37 |
---
|
|
|
4c0d37 |
Make.defaults | 14 +++++++++++++-
|
|
|
4c0d37 |
1 file changed, 13 insertions(+), 1 deletion(-)
|
|
|
4c0d37 |
|
|
|
4c0d37 |
diff --git a/Make.defaults b/Make.defaults
|
|
|
4c0d37 |
index 696028dd6c2..157559d20ee 100755
|
|
|
4c0d37 |
--- a/Make.defaults
|
|
|
4c0d37 |
+++ b/Make.defaults
|
|
|
4c0d37 |
@@ -47,7 +47,19 @@ ARCHES=aa64 arm ia32 ia64 mips64el x64
|
|
|
4c0d37 |
# Where to install the package. GNU-EFI will create and access
|
|
|
4c0d37 |
# lib and include under the root
|
|
|
4c0d37 |
#
|
|
|
4c0d37 |
-INSTALLROOT := /
|
|
|
4c0d37 |
+DESTDIR ?= /
|
|
|
4c0d37 |
+ifeq ($(origin INSTALLROOT),undefined)
|
|
|
4c0d37 |
+INSTALLROOT = $(DESTDIR)
|
|
|
4c0d37 |
+endif
|
|
|
4c0d37 |
+
|
|
|
4c0d37 |
+empty :=
|
|
|
4c0d37 |
+space := $(empty) $(empty)
|
|
|
4c0d37 |
+stripped = $(subst $(space),/,$(strip $(subst /,$(space),$(1))))
|
|
|
4c0d37 |
+unstripped = $(subst $(space),/,$(subst /,$(space),$(1)))
|
|
|
4c0d37 |
+is_absolute = $(subst $(call stripped,$(1)),$(empty),$(call unstripped,$(1)))
|
|
|
4c0d37 |
+
|
|
|
4c0d37 |
+override INSTALLROOT:=$(if $(call is_absolute,$(INSTALLROOT)),,$(TOPDIR)/)$(INSTALLROOT)
|
|
|
4c0d37 |
+
|
|
|
4c0d37 |
PREFIX := /usr/local
|
|
|
4c0d37 |
LIBDIR := $(PREFIX)/lib
|
|
|
4c0d37 |
INSTALL := install
|