| Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 1 | From 5e3b74927b4fef03d91518d235e9e3ba8cd7ab2e Mon Sep 17 00:00:00 2001 |
| 2 | From: Alexander Kanavin <alex@linutronix.de> |
| 3 | Date: Wed, 9 Nov 2022 20:49:41 +0100 |
| 4 | Subject: [PATCH] Makefile.am: do not clobber PYTHONPATH from build environment |
| 5 | |
| 6 | This environment variable has special significance for python, |
| 7 | and so lirc's variable has to be named something else. |
| 8 | |
| 9 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> |
| 10 | --- |
| 11 | Makefile.am | 2 +- |
| 12 | pylint.mak | 2 +- |
| 13 | tools/Makefile.am | 2 +- |
| 14 | 3 files changed, 3 insertions(+), 3 deletions(-) |
| 15 | |
| 16 | diff --git a/Makefile.am b/Makefile.am |
| 17 | index 6718af1..fae423e 100644 |
| 18 | --- a/Makefile.am |
| 19 | +++ b/Makefile.am |
| 20 | @@ -128,7 +128,7 @@ endif |
| 21 | |
| 22 | pylint: .phony |
| 23 | $(MAKE) -C tools pylint |
| 24 | - -PYTHONPATH=$(PYTHONPATH) $(PYLINT) --rcfile=pylint.conf \ |
| 25 | + -PYTHONPATH=$(LIRCPYTHONPATH) $(PYLINT) --rcfile=pylint.conf \ |
| 26 | --msg-template='$(pylint_template)' $(py_PYTHON) |
| 27 | |
| 28 | pep8: $(py_PYTHON) |
| 29 | diff --git a/pylint.mak b/pylint.mak |
| 30 | index bf427ab..2692951 100644 |
| 31 | --- a/pylint.mak |
| 32 | +++ b/pylint.mak |
| 33 | @@ -1,5 +1,5 @@ |
| 34 | PYTHONPATH1 = $(abs_top_srcdir)/python-pkg/lirc: |
| 35 | PYTHONPATH2 = $(abs_top_srcdir)/python-pkg/lirc/lib/.libs |
| 36 | -PYTHONPATH = $(PYTHONPATH1):$(PYTHONPATH2) |
| 37 | +LIRCPYTHONPATH = $(PYTHONPATH1):$(PYTHONPATH2) |
| 38 | PYLINT = python3-pylint |
| 39 | pylint_template = {path}:{line}: [{msg_id}({symbol}), {obj}] {msg} |
| 40 | diff --git a/tools/Makefile.am b/tools/Makefile.am |
| 41 | index 85d1fd0..96b17f8 100644 |
| 42 | --- a/tools/Makefile.am |
| 43 | +++ b/tools/Makefile.am |
| 44 | @@ -142,7 +142,7 @@ force-pylint: .phony |
| 45 | |
| 46 | pylint: .pylint-stamp |
| 47 | .pylint-stamp: $(py_sources) |
| 48 | - -PYTHONPATH=$(PYTHONPATH) $(PYLINT) --rcfile=../pylint.conf \ |
| 49 | + -PYTHONPATH=$(LIRCPYTHONPATH) $(PYLINT) --rcfile=../pylint.conf \ |
| 50 | --msg-template='$(pylint_template)' $? && touch $@ |
| 51 | |
| 52 | .phony: |
| 53 | -- |
| 54 | 2.30.2 |
| 55 | |