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 <ijackson@chiark.greenend.org.uk>

diff --git a/devLib/Makefile b/devLib/Makefile
index 48cf3ae0e1d4249a556be27abdb3d586d874cb50..9ec163dbd04c8fc0a070b3c38ba0421183708901 100644 (file)
--- 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 82a817cd826f2094102ca6de8a80c1c79e55dcd6..095ec48aa3db13bf06af0b0b3403b6db44817f77 100644 (file)
--- a/gpio/Makefile
+++ b/gpio/Makefile
@@ -23,8 +23,8 @@
 #    along with wiringPi.  If not, see <http://www.gnu.org/licenses/>.
 #################################################################################
 
-DESTDIR=/usr
-PREFIX=/local
+DESTDIR?=/usr
+PREFIX?=/local
 
 ifneq ($V,1)
 Q ?= @

diff --git a/wiringPi/Makefile b/wiringPi/Makefile
index 3a1b99f89aae61d00d6818a6fecb61925164ac02..c0623ce3f14e833b9e421584d5e210843864552d 100644 (file)
--- 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 ?= @