From: R. Steve McKown <rsmckown@gmail.com>
Date: Fri, 23 Apr 2010 22:39:53 +0000 (-0600)
Subject: Don't hard-code for ncc in mig and ncg scripts.
X-Git-Tag: patchset/2.1.1-4.5~8
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=e522ea4d25f311d0ae6e70b75a182dbc50ce101b

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 3dc87127..61cbfc25 100644
--- 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 6bcb50d2..4633bf38 100644
--- 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