Support %F substitution for @includes

.platform and .family files can use %F when adding to includes.  %F is
replaced with the family dir at build time.

diff --git a/tools/tinyos/ncc/ncc.in b/tools/tinyos/ncc/ncc.in
index 2f61d921400ce5f896b6b7aeb4f5d6b2b6e3db80..b1fee5cec0c51ee8ec6bafcf3759295c7d93471c 100644 (file)
--- a/tools/tinyos/ncc/ncc.in
+++ b/tools/tinyos/ncc/ncc.in
@@ -233,7 +233,11 @@ $platform_dir = $platform_def;
 $platform_dir =~ s!/\.platform$!!;
 push @includes, $platform_dir unless $nostdinc;
 do $platform_def;
-do $family_def if -f $family_def;
+if (-f $family_def) {
+    $family_dir = $family_def;
+    $family_dir =~ s!/\.family$!!;
+    do $family_def
+}
 unshift @new_args, "-DPLATFORM_\U$target";
 
 push @new_args, @opts;
@@ -300,6 +304,7 @@ sub idir_subst {
        $rep = $TOSDIR if $char eq "T";
        $rep = $target if $char eq "p";
        $rep = $platform_dir if $char eq "P";
+       $rep = $family_dir if $char eq "F";
        &fail("unknown include-path substitution %" . $char) if !$rep;
        substr($idir, $idx, 2) = $rep;
        $idx += length $rep;