Mercurial > hg > Members > kono > nitros9-code

changeset 2906:67dfbd60d548

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Set default NITROS9DIR in Makefile not rules.mak In most cases rules.mak anyway couldn't be found if NITROS9DIR was unset. So set it in the top-level makefile instead, and let it default to the current directory, where the top-level make is run.
author Tormod Volden <debian.tormod@gmail.com>
date Sat, 11 Jan 2014 20:56:53 +0100
parents bd215b95cd59
children fea8efaf4583
files makefile rules.mak
diffstat 2 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/makefile	Sat Jan 11 20:56:53 2014 +0100
+++ b/makefile	Sat Jan 11 20:56:53 2014 +0100
@@ -1,3 +1,10 @@
+
+ifndef NITROS9DIR
+NITROS9DIR = $(PWD)
+endif
+
+export NITROS9DIR
+
 include rules.mak
 
 dirs	=  $(NOSLIB) $(LEVEL1) $(LEVEL2) $(LEVEL3) $(3RDPARTY)
--- a/rules.mak	Sat Jan 11 20:56:53 2014 +0100
+++ b/rules.mak	Sat Jan 11 20:56:53 2014 +0100
@@ -24,9 +24,6 @@
 
 NITROS9VER	= v0$(NOS9VER)0$(NOS9MAJ)0$(NOS9MIN)
 
-ifndef	NITROS9DIR
-NITROS9DIR	= $(HOME)/nitros9
-endif
 ifndef	CLOUD9DIR
 CLOUD9DIR	= $(HOME)/cloud9
 endif