Przeglądaj źródła

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.
Brad King 16 lat temu
rodzic
commit
28531d1707
2 zmienionych plików z 3 dodań i 4 usunięć
  1. 1 2
      bootstrap
  2. 2 2
      configure

+ 1 - 2
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`"

+ 2 - 2
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" "$@"