From 9be6acb958fd9cff435a02b60cdee7df3a91a375 Mon Sep 17 00:00:00 2001 From: "R. Steve McKown" Date: Fri, 23 Apr 2010 16:39:53 -0600 Subject: [PATCH] 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. --- tools/tinyos/ncc/mig.in | 3 ++- tools/tinyos/ncc/ncg.in | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) 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 -- 2.39.2