* Moved the DeferredSubInclude rules into MiscRules.

* Added new rule HaikuSubInclude for more comfortable subdirectory inclusion. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20352 a95241bf-73f2-0310-859d-f6bbb57e9c96
2007-03-07 16:01:19 +00:00
parent 446ce41f36
commit 3f2a43554a
3 changed files with 57 additions and 39 deletions
@@ -657,7 +657,13 @@ rule SubInclude
 		config = $(HAIKU_INHERITED_SUBDIR_CONFIG) ;
 	}

+	# store SUBDIR_TOKENS
+	local oldSubDirTokens = $(SUBDIR_TOKENS) ;
+
 	on $(config) {
 		include [ FDirName $($(1[1])) $(1[2-) $(JAMFILE) ] ;
 	}
+
+	# restore SUBDIR_TOKENS
+	SUBDIR_TOKENS = $(oldSubDirTokens) ;
 }