[Cmake-commits] [cmake-commits] king committed bootstrap 1.125 1.126 configure 1.38 1.39

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake
In directory public:/mounts/ram/cvs-serv8896

Modified Files:
	bootstrap configure 
Log Message:
Simplify bootstrap script source dir detection

This teaches the bootstrap shell script to detect the CMake source
directory from which it is executed using a simpler idiom.


Index: bootstrap
===================================================================
RCS file: /cvsroot/CMake/CMake/bootstrap,v
retrieving revision 1.125
retrieving revision 1.126
diff -C 2 -d -r1.125 -r1.126
*** bootstrap	22 Sep 2009 20:12:40 -0000	1.125
--- bootstrap	25 Sep 2009 14:48:24 -0000	1.126
***************
*** 35,40 ****
  # Detect system and directory information.
  cmake_system=`uname`
! cmake_source_dir=`echo $0 | sed -n '/\//{s/\/[^\/]*$//;p;}'`
! cmake_source_dir=`(cd "${cmake_source_dir}";pwd)`
  cmake_binary_dir=`pwd`
  cmake_version_major="`cmake_version_component MAJOR`"
--- 35,39 ----
  # Detect system and directory information.
  cmake_system=`uname`
! cmake_source_dir=`cd "\`dirname \"$0\"\`";pwd`
  cmake_binary_dir=`pwd`
  cmake_version_major="`cmake_version_component MAJOR`"

Index: configure
===================================================================
RCS file: /cvsroot/CMake/CMake/configure,v
retrieving revision 1.38
retrieving revision 1.39
diff -C 2 -d -r1.38 -r1.39
*** configure	23 Jun 2003 12:58:19 -0000	1.38
--- configure	25 Sep 2009 14:48:24 -0000	1.39
***************
*** 1,3 ****
! #! /bin/sh
! cmake_source_dir=`echo $0 | sed -n '/\//{s/\/[^\/]*$//;p;}'`
  exec "${cmake_source_dir}/bootstrap" "$@"
--- 1,3 ----
! #!/bin/sh
! cmake_source_dir=`cd "\`dirname \"$0\"\`";pwd`
  exec "${cmake_source_dir}/bootstrap" "$@"