Browse Source

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.
master
Brad King 12 years ago
parent
commit
28531d1707
  1. 3
      bootstrap
  2. 4
      configure

3
bootstrap

@ -34,8 +34,7 @@ cmake_date_stamp_component()
# 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_source_dir=`cd "\`dirname \"$0\"\`";pwd`
cmake_binary_dir=`pwd`
cmake_version_major="`cmake_version_component MAJOR`"
cmake_version_minor="`cmake_version_component MINOR`"

4
configure

@ -1,3 +1,3 @@
#! /bin/sh
cmake_source_dir=`echo $0 | sed -n '/\//{s/\/[^\/]*$//;p;}'`
#!/bin/sh
cmake_source_dir=`cd "\`dirname \"$0\"\`";pwd`
exec "${cmake_source_dir}/bootstrap" "$@"
Loading…
Cancel
Save