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.
This commit is contained in:
Brad King 2009-09-25 10:48:24 -04:00
parent d468145fa2
commit 28531d1707
2 changed files with 3 additions and 4 deletions

View File

@ -34,8 +34,7 @@ cmake_date_stamp_component()
# Detect system and directory information. # Detect system and directory information.
cmake_system=`uname` cmake_system=`uname`
cmake_source_dir=`echo $0 | sed -n '/\//{s/\/[^\/]*$//;p;}'` cmake_source_dir=`cd "\`dirname \"$0\"\`";pwd`
cmake_source_dir=`(cd "${cmake_source_dir}";pwd)`
cmake_binary_dir=`pwd` cmake_binary_dir=`pwd`
cmake_version_major="`cmake_version_component MAJOR`" cmake_version_major="`cmake_version_component MAJOR`"
cmake_version_minor="`cmake_version_component MINOR`" cmake_version_minor="`cmake_version_component MINOR`"

2
configure vendored
View File

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