[GRASS-SVN] r49159 - grass/trunk/include/Make

svn_grass at osgeo.org svn_grass at osgeo.org
Wed Nov 9 12:41:23 EST 2011


Author: glynn
Date: 2011-11-09 09:41:23 -0800 (Wed, 09 Nov 2011)
New Revision: 49159

Modified:
   grass/trunk/include/Make/Rules.make
Log:
Add $(ARCH_INCDIR)/... to PATH and PYTHONPATH


Modified: grass/trunk/include/Make/Rules.make
===================================================================
--- grass/trunk/include/Make/Rules.make	2011-11-09 17:32:54 UTC (rev 49158)
+++ grass/trunk/include/Make/Rules.make	2011-11-09 17:41:23 UTC (rev 49159)
@@ -27,11 +27,14 @@
 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)



More information about the grass-commit mailing list