aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2015-02-12 13:29:08 +0100
committerLorenz Meier <lm@inf.ethz.ch>2015-02-12 13:29:08 +0100
commiteeb192730f813f2e3278103a7c899233e6da03b0 (patch)
treeff0c8578f6fc6b19cb8bee4a076040f220cf5de8
parentd736311982821294670c8e306e01a3e3c5e8de19 (diff)
downloadpx4-firmware-eeb192730f813f2e3278103a7c899233e6da03b0.tar.gz
px4-firmware-eeb192730f813f2e3278103a7c899233e6da03b0.tar.bz2
px4-firmware-eeb192730f813f2e3278103a7c899233e6da03b0.zip
Revert "include default PYTHONPATH in call to uorb header generation script"
This reverts commit 7e6198b3dd517e1158431c8344c5912a6c28b363.
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index ab8c614e1..05e0d90a2 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):$(PYTHONPATH) $(PYTHON) \
+ $(Q) (PYTHONPATH=$(GENMSG_PYTHONPATH):$(GENCPP_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):$(PYTHONPATH) $(PYTHON) \
+ $(Q) (PYTHONPATH=$(GENMSG_PYTHONPATH):$(GENCPP_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