Makefile: Extend PYTHONPATH rather than overriding it

dezgeg · dezgeg · commit 9beef522926a · 2018-03-13T14:43:20.000+02:00
Currently, if the user has compiled the libfdt Python module from dtc
upstream to a non-default location, it cannot be used because the
'PYTHONPATH=tools' assignment wipes out the user's PYTHONPATH.
Instead, extend PYTHONPATH in the main Makefile instead of overriding it.

Signed-off-by: Tuomas Tynkkynen &lt;tuomas@tuxera.com&gt;
diff --git a/Makefile b/Makefile
@@ -348,10 +348,16 @@ OBJCOPY		= $(CROSS_COMPILE)objcopy
 OBJDUMP		= $(CROSS_COMPILE)objdump
 AWK		= awk
 PERL		= perl
-PYTHON		?= python
 DTC		?= $(objtree)/scripts/dtc/dtc
 CHECK		= sparse
 
+PYTHON		?= python
+ifeq ($(PYTHONPATH),)
+PYTHONPATH := scripts/dtc/pylibfdt
+else
+PYTHONPATH := $(PYTHONPATH):scripts/dtc/pylibfdt
+endif
+
 CHECKFLAGS     := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \
 		  -Wbitwise -Wno-return-void -D__CHECK_ENDIAN__ $(CF)
 
diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl
@@ -244,13 +244,11 @@ $(obj)/$(SPL_BIN)-pad.bin: $(obj)/$(SPL_BIN)
 $(obj)/$(SPL_BIN).dtb: dts/dt-spl.dtb FORCE
 	$(call if_changed,copy)
 
-pythonpath = PYTHONPATH=scripts/dtc/pylibfdt
-
 quiet_cmd_dtocc = DTOC C  $@
-cmd_dtocc = $(pythonpath) $(srctree)/tools/dtoc/dtoc -d $(obj)/$(SPL_BIN).dtb -o $@ platdata
+cmd_dtocc = $(srctree)/tools/dtoc/dtoc -d $(obj)/$(SPL_BIN).dtb -o $@ platdata
 
 quiet_cmd_dtoch = DTOC H  $@
-cmd_dtoch = $(pythonpath) $(srctree)/tools/dtoc/dtoc -d $(obj)/$(SPL_BIN).dtb -o $@ struct
+cmd_dtoch = $(srctree)/tools/dtoc/dtoc -d $(obj)/$(SPL_BIN).dtb -o $@ struct
 
 quiet_cmd_plat = PLAT    $@
 cmd_plat = $(CC) $(c_flags) -c $< -o $@
