From c8432fe18f73035ba6d68624d9e6a70ffb1075cd Mon Sep 17 00:00:00 2001 From: Felix Ruess Date: Sun, 17 Aug 2014 23:40:43 +0200 Subject: [PATCH] [build] only set PAPARAZZI_SRC if not already externally set closes #800 --- Makefile | 2 +- Makefile.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 89e04fb0c0..e96f1fb4cd 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ ifeq ($(Q),@) MAKEFLAGS += --no-print-directory endif -PAPARAZZI_SRC=$(shell pwd) +PAPARAZZI_SRC ?= $(shell pwd) empty= space=$(empty) $(empty) ifneq ($(findstring $(space),$(PAPARAZZI_SRC)),) diff --git a/Makefile.ac b/Makefile.ac index 55a30eef1b..d85e2bbd68 100644 --- a/Makefile.ac +++ b/Makefile.ac @@ -21,7 +21,7 @@ # Preprocessing of XML configuration files -PAPARAZZI_SRC=$(shell pwd) +PAPARAZZI_SRC ?= $(shell pwd) include conf/Makefile.local