Mercurial > gub

changeset 3440:5e013063eeaf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bugfixes for LOCAL_GUB_[BUILDER_]OPTIONS.
author Jan Nieuwenhuizen <janneke@gnu.org>
date Sat, 05 May 2007 13:10:23 +0200
parents 705140872d8a
children 66992c82c423
files compilers.make gub.make
diffstat 2 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/compilers.make	Sat May 05 11:46:16 2007 +0200
+++ b/compilers.make	Sat May 05 13:10:23 2007 +0200
@@ -27,8 +27,6 @@
 default: cross-compilers
 compilers: cross-compilers
 
--include local.make
-
 ifeq ($(BUILD_PLATFORM),)
 $(error Must define BUILD_PLATFORM)
 endif
--- a/gub.make	Sat May 05 11:46:16 2007 +0200
+++ b/gub.make	Sat May 05 13:10:23 2007 +0200
@@ -1,7 +1,9 @@
 CWD:=$(shell pwd)
 PYTHON=python
-#PYTHONPATH=gub
-#export PYTHONPATH
+PYTHONPATH=.
+export PYTHONPATH
+
+-include local.make
 
 ## must always have one host.
 GUB_DISTCC_ALLOW_HOSTS=127.0.0.1
@@ -13,7 +15,7 @@
 
 ifneq ($(LOCAL_GUB_BUILDER_OPTIONS),)
 $(warning LOCAL_GUB_BUILDER_OPTIONS is deprecated, use LOCAL_GUB_OPTIONS)
-LOCAL_GUB_OPTIONS += LOCAL_GUB_BUILDER_OPTIONS
+LOCAL_GUB_OPTIONS += $(LOCAL_GUB_BUILDER_OPTIONS)
 endif
 
 INVOKE_GUB=$(GUB)\