From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Wed, 23 Jan 2019 17:38:25 +0000 (-0500)
Subject: OK, allow DESTDIR to be used as a default BUILDROOT, much like we do for
X-Git-Tag: v2.3b8~136
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=083672b18ce39071613f0924df904ef91b65ded2;p=thirdparty%2Fcups.git

OK, allow DESTDIR to be used as a default BUILDROOT, much like we do for
DSTROOT.
---

diff --git a/Makedefs.in b/Makedefs.in
index 8bb06608dd..1c3bc16cfc 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -1,7 +1,7 @@
 #
 # Common makefile definitions for CUPS.
 #
-# Copyright © 2007-2018 by Apple Inc.
+# Copyright © 2007-2019 by Apple Inc.
 # Copyright © 1997-2007 by Easy Software Products, all rights reserved.
 #
 # Licensed under Apache License v2.0.  See the file "LICENSE" for more
@@ -213,7 +213,7 @@ srcdir		=	@srcdir@
 sysconfdir	=	@sysconfdir@
 top_srcdir	=	@top_srcdir@
 
-BUILDROOT	=	$(DSTROOT)
+BUILDROOT	=	$(DSTROOT)$(DESTDIR)
 
 AMANDIR		=	$(BUILDROOT)@AMANDIR@
 BINDIR		=	$(BUILDROOT)@bindir@