[Tinyos-commits] CVS: tinyos-1.x/tools/release/external-tools msp430tools-base.spec, 1.1, 1.2

[Kristin Wright]

Update of /cvsroot/tinyos/tinyos-1.x/tools/release/external-tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5647

Modified Files:
	msp430tools-base.spec 
Log Message:
works w/linux and cygwin

Index: msp430tools-base.spec
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tools/release/external-tools/msp430tools-base.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** msp430tools-base.spec	21 Sep 2005 17:25:59 -0000	1.1
--- msp430tools-base.spec	21 Sep 2005 17:26:54 -0000	1.2
***************
*** 17,21 ****
  #Icon:		???
  #BuildRequires:	??? >= ???
! ExclusiveOS:	linux
  #Requires:	??? >= ???
  #Conflicts:	??? <= ???
--- 17,21 ----
  #Icon:		???
  #BuildRequires:	??? >= ???
! #ExclusiveOS:	linux
  #Requires:	??? >= ???
  #Conflicts:	??? <= ???
***************
*** 63,66 ****
--- 63,69 ----
  
  %install
+ if [ -z "$RPM_INSTALL_PREFIX" ]; then
+   RPM_INSTALL_PREFIX=/opt/msp430
+ fi
  rm -rf $RPM_BUILD_ROOT
  make prefix=$RPM_BUILD_ROOT%{prefix} install
***************
*** 68,75 ****
--- 71,88 ----
  
  %clean
+ if [ -z "$RPM_INSTALL_PREFIX" ]; then
+   RPM_INSTALL_PREFIX=/opt/msp430
+   CYGWIN=1
+ fi
  rm -rf $RPM_BUILD_ROOT
  
  %post
  #!/bin/sh
+ # Create msp430tools.[csh,sh] with the user-selected prefix
+ CYGWIN=0
+ if [ -z "$RPM_INSTALL_PREFIX" ]; then
+   RPM_INSTALL_PREFIX=/opt/msp430
+   CYGWIN=1
+ fi
  [ -d /etc/profile.d ] || mkdir -p /etc/profile.d
  REPLACEMENT_EXP="s!@msp430tools_install_dir@!$RPM_INSTALL_PREFIX!g"
***************
*** 78,83 ****
  mv $RPM_INSTALL_PREFIX/etc/msp430tools.csh.out $RPM_INSTALL_PREFIX/etc/msp430tools.csh
  mv $RPM_INSTALL_PREFIX/etc/msp430tools.sh.out $RPM_INSTALL_PREFIX/etc/msp430tools.sh
! ln -fs $RPM_INSTALL_PREFIX/etc/msp430tools.csh /etc/profile.d/msp430tools.csh
! ln -fs $RPM_INSTALL_PREFIX/etc/msp430tools.sh /etc/profile.d/msp430tools.sh
  
  
--- 91,102 ----
  mv $RPM_INSTALL_PREFIX/etc/msp430tools.csh.out $RPM_INSTALL_PREFIX/etc/msp430tools.csh
  mv $RPM_INSTALL_PREFIX/etc/msp430tools.sh.out $RPM_INSTALL_PREFIX/etc/msp430tools.sh
! # scripts don't run in profile.d as links on cygwin
! if [ $CYGWIN -eq 1 ]; then
!   cp $RPM_INSTALL_PREFIX/etc/msp430tools.csh /etc/profile.d/msp430tools.csh
!   cp $RPM_INSTALL_PREFIX/etc/msp430tools.sh /etc/profile.d/msp430tools.sh
! else
!   ln -fs $RPM_INSTALL_PREFIX/etc/msp430tools.csh /etc/profile.d/msp430tools.csh
!   ln -fs $RPM_INSTALL_PREFIX/etc/msp430tools.sh /etc/profile.d/msp430tools.sh
! fi