From 27a984e254b224222415429b13b11b352fdf54e0 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 1 Oct 2012 23:09:56 +0200 Subject: [PATCH] Use both DESTDIR and prefix The DESTDIR variable is not intended as a prefix substitute, but as an additonal staging pre-path. Concatenate the two when available. Signed-off-by: Luca Bruno --- Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index 25d44952444..a7594261c29 100644 --- a/Makefile.in +++ b/Makefile.in @@ -537,8 +537,8 @@ endif ifneq ($(findstring install,$(MAKECMDGOALS)),) ifdef DESTDIR - CFG_INFO := $(info cfg: setting CFG_PREFIX via DESTDIR, $(DESTDIR)) - CFG_PREFIX:=$(DESTDIR) + CFG_INFO := $(info cfg: setting CFG_PREFIX via DESTDIR, $(DESTDIR)/$(CFG_PREFIX)) + CFG_PREFIX:=$(DESTDIR)/$(CFG_PREFIX) export CFG_PREFIX endif