Adjust build scripts.

[tinyos-2.x.git] / tools / release / tinyos-tools.spec

diff --git a/tools/release/tinyos-tools.spec b/tools/release/tinyos-tools.spec
index 916bb16bfc3cd13e500e69b7cc495a736aa9bd48..0fe0968f79a017c967b753babf98545847c21525 100644 (file)
--- a/tools/release/tinyos-tools.spec
+++ b/tools/release/tinyos-tools.spec
@@ -2,8 +2,8 @@
 
 Summary: TinyOS tools 
 Name: tinyos-tools
-Version: 1.2.4
-Release: 2
+Version: 1.4.0
+Release: 1%{dist}
 License: Please see source
 Group: Development/System
 URL: http://www.tinyos.net/
@@ -11,11 +11,11 @@ BuildRoot: %{_tmppath}/%{name}-root
 Source0: %{name}-%{version}.tar.gz
 # This makes cygwin happy
 Provides: /bin/sh /bin/bash
-Requires: nesc >= 1.2.7
+Requires: nesc >= 1.3
 
 %description
 Tools for use with tinyos. Includes, for example: uisp, motelist, pybsl, mig,
-ncc and nesdoc. The source for these tools is found in the TinyOS CSV
+ncc and nesdoc. The source for these tools is found in the TinyOS CVS
 repository under tinyos-2.x/tools.
 
 %prep
@@ -24,7 +24,7 @@ repository under tinyos-2.x/tools.
 %build
 cd tools
 ./Bootstrap
-TOSDIR=/opt/tinyos-2.x/tos ./configure --prefix=/usr
+NESCC_PREFIX=/usr TOSDIR=/opt/tinyos-2.x/tos ./configure --prefix=/usr
 make
 
 %install
@@ -60,6 +60,7 @@ if [ $? -ne 0 ]; then
 fi
 %ifos linux
 java=`$RPM_INSTALL_PREFIX/bin/tos-locate-jre --java`
+tinyoslibdir=$RPM_INSTALL_PREFIX/lib/tinyos
 bits=32
 if [ $? -ne 0 ]; then
   echo "java command not found - assuming 32 bits"