Przeglądaj źródła

Add $(ARCH_INCDIR)/... to PATH and PYTHONPATH

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@49159 15284696-431f-4ddb-bdfa-cd5b030d7da7
Glynn Clements 13 lat temu
rodzic
commit
d97ae177f1
1 zmienionych plików z 5 dodań i 2 usunięć
  1. 5 2
      include/Make/Rules.make

+ 5 - 2
include/Make/Rules.make

@@ -27,11 +27,14 @@ else
 mkpath = $(1):$(2)
 endif
 
+GRASS_PYTHONPATH := $(call mkpath,$(GISBASE)/etc/python,$$PYTHONPATH)
+GRASS_PYTHONPATH := $(call mkpath,$(ARCH_DISTDIR)/etc/python,$(GRASS_PYTHONPATH))
+
 run_grass = \
 	GISRC=$(RUN_GISRC) \
 	GISBASE=$(RUN_GISBASE) \
-	PATH="$(GISBASE)/bin:$$PATH" \
-	PYTHONPATH="$(call mkpath,$(GISBASE)/etc/python,$$PYTHONPATH)" \
+	PATH="$(ARCH_DISTDIR)/bin:$(GISBASE)/bin:$$PATH" \
+	PYTHONPATH="$(GRASS_PYTHONPATH)" \
 	$(LD_LIBRARY_PATH_VAR)="$(BIN):$(ARCH_LIBDIR):$(BASE_LIBDIR):$($(LD_LIBRARY_PATH_VAR))" \
 	LC_ALL=C \
 	$(1)