From 508d6b31bd9564fa2f0a6676089d4495d2917a2d Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 12 Sep 2015 17:15:44 +0000 Subject: [PATCH] Makefiles: Do not override PREFIX or DESTDIR from the environment These are not set in normal shell sessions. Honouring existing settings allows the caller of ./build to specify alternative values. Signed-off-by: Ian Jackson --- devLib/Makefile | 4 ++-- gpio/Makefile | 4 ++-- wiringPi/Makefile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/devLib/Makefile b/devLib/Makefile index 48cf3ae..9ec163d 100644 --- a/devLib/Makefile +++ b/devLib/Makefile @@ -22,8 +22,8 @@ ################################################################################# VERSION=$(shell cat ../VERSION) -DESTDIR=/usr -PREFIX=/local +DESTDIR?=/usr +PREFIX?=/local ifneq ($V,1) Q ?= @ diff --git a/gpio/Makefile b/gpio/Makefile index 82a817c..095ec48 100644 --- a/gpio/Makefile +++ b/gpio/Makefile @@ -23,8 +23,8 @@ # along with wiringPi. If not, see . ################################################################################# -DESTDIR=/usr -PREFIX=/local +DESTDIR?=/usr +PREFIX?=/local ifneq ($V,1) Q ?= @ diff --git a/wiringPi/Makefile b/wiringPi/Makefile index 3a1b99f..c0623ce 100644 --- a/wiringPi/Makefile +++ b/wiringPi/Makefile @@ -22,8 +22,8 @@ ################################################################################# VERSION=$(shell cat ../VERSION) -DESTDIR=/usr -PREFIX=/local +DESTDIR?=/usr +PREFIX?=/local ifneq ($V,1) Q ?= @ -- 2.30.2