Don't hard-code for ncc in mig and ncg scripts.

The rationalization for this change is that nesc shouldn't really know where
tinyos-tools is installed, since they are separate packages.  The pragmatic
reason for this change is that it allows using ncc from tinyos-tools before
installation to allow a single debian tinyos source package to build both
tinyos-tools and tinyos-source-VERSION packages.

diff --git a/tools/tinyos/ncc/mig.in b/tools/tinyos/ncc/mig.in
index 3dc8712788c05218278b54d4d99ef84d37d91f42..61cbfc2564ba9e1ab5dc0ca963931ee3092ae399 100644 (file)
--- a/tools/tinyos/ncc/mig.in
+++ b/tools/tinyos/ncc/mig.in
@@ -10,7 +10,8 @@
 
 prefix="@prefix@";
 exec_prefix="@exec_prefix@";
-exec "@nescc_prefix@/bin/nescc-mig" "-nescc=$exec_prefix/bin/ncc" "$@"
+#exec "@nescc_prefix@/bin/nescc-mig" "-nescc=$exec_prefix/bin/ncc" "$@"
+exec "@nescc_prefix@/bin/nescc-mig" "-nescc=ncc" "$@"
 err=$?
 echo "Couldn't execute @nescc_prefix@/bin/nescc-mig" >&2
 exit $err

diff --git a/tools/tinyos/ncc/ncg.in b/tools/tinyos/ncc/ncg.in
index 6bcb50d28be4e9a87bcffaaa5c9e6958fd3937c7..4633bf38163259f4b9cb4e77a99f147aab31014d 100644 (file)
--- a/tools/tinyos/ncc/ncg.in
+++ b/tools/tinyos/ncc/ncg.in
@@ -10,7 +10,8 @@
 
 prefix="@prefix@";
 exec_prefix="@exec_prefix@";
-exec "@nescc_prefix@/bin/nescc-ncg" "-nescc=$exec_prefix/bin/ncc" "$@"
+#exec "@nescc_prefix@/bin/nescc-ncg" "-nescc=$exec_prefix/bin/ncc" "$@"
+exec "@nescc_prefix@/bin/nescc-ncg" "-nescc=ncc" "$@"
 err=$?
 echo "Couldn't execute @nescc_prefix@/bin/nescc-ncg" >&2
 exit $err