aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorAndrew Tridgell <andrew@tridgell.net>2015-02-13 21:38:21 +1100
committerLorenz Meier <lm@inf.ethz.ch>2015-02-16 22:54:32 +0100
commit91aab00fa0ba65b426e3179bbfb936557d3d6209 (patch)
tree40c7deb7fa513dadf249fc34f88d22e1eb99dc7f /Makefile
parent618d51dab113d3beced93d2ce2c29f29d0c3e5db (diff)
downloadpx4-firmware-91aab00fa0ba65b426e3179bbfb936557d3d6209.tar.gz
px4-firmware-91aab00fa0ba65b426e3179bbfb936557d3d6209.tar.bz2
px4-firmware-91aab00fa0ba65b426e3179bbfb936557d3d6209.zip
build: avoid wiping an existing PYTHONPATH variable
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 05e0d90a2..ab8c614e1 100644
--- a/Makefile
+++ b/Makefile
@@ -238,11 +238,11 @@ GENCPP_PYTHONPATH = $(PX4_BASE)Tools/gencpp/src
.PHONY: generateuorbtopicheaders
generateuorbtopicheaders:
@$(ECHO) "Generating uORB topic headers"
- $(Q) (PYTHONPATH=$(GENMSG_PYTHONPATH):$(GENCPP_PYTHONPATH) $(PYTHON) \
+ $(Q) (PYTHONPATH=$(GENMSG_PYTHONPATH):$(GENCPP_PYTHONPATH):$(PYTHONPATH) $(PYTHON) \
$(PX4_BASE)Tools/px_generate_uorb_topic_headers.py \
-d $(MSG_DIR) -o $(TOPICS_DIR) -e $(UORB_TEMPLATE_DIR) -t $(TOPICHEADER_TEMP_DIR))
@$(ECHO) "Generating multiplatform uORB topic wrapper headers"
- $(Q) (PYTHONPATH=$(GENMSG_PYTHONPATH):$(GENCPP_PYTHONPATH) $(PYTHON) \
+ $(Q) (PYTHONPATH=$(GENMSG_PYTHONPATH):$(GENCPP_PYTHONPATH):$(PYTHONPATH) $(PYTHON) \
$(PX4_BASE)Tools/px_generate_uorb_topic_headers.py \
-d $(MSG_DIR) -o $(MULTIPLATFORM_HEADER_DIR) -e $(MULTIPLATFORM_TEMPLATE_DIR) -t $(TOPICHEADER_TEMP_DIR) -p $(MULTIPLATFORM_PREFIX))
# clean up temporary files