summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorAndy Cedilnik <andy.cedilnik@kitware.com>2002-05-02 12:46:20 (GMT)
committerAndy Cedilnik <andy.cedilnik@kitware.com>2002-05-02 12:46:20 (GMT)
commita8d3805ef396b5a3f75eb851ba3a976274121836 (patch)
tree767b6fe78982ebb9505b1b615627ece115e99e74 /configure
parent3d4230033ad4eae858c2fd3400e0d7bf8007d1a8 (diff)
downloadCMake-a8d3805ef396b5a3f75eb851ba3a976274121836.zip
CMake-a8d3805ef396b5a3f75eb851ba3a976274121836.tar.gz
CMake-a8d3805ef396b5a3f75eb851ba3a976274121836.tar.bz2
Improve bootstrap on UNIX. Now it bootstraps into a separate directory.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure8
1 files changed, 4 insertions, 4 deletions
diff --git a/configure b/configure
index b3817bd..7e64c1e 100755
--- a/configure
+++ b/configure
@@ -1179,7 +1179,7 @@ done
ac_given_srcdir=$srcdir
-trap 'rm -fr `echo "Source/InitialConfigureFlags.cmake Makefile Source/Makefile Source/cmConfigure.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "Source/InitialConfigureFlags.cmake Source/bootstrap/Makefile Source/cmConfigure.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
EOF
cat >> $CONFIG_STATUS <<EOF
@@ -1259,7 +1259,7 @@ EOF
cat >> $CONFIG_STATUS <<EOF
-CONFIG_FILES=\${CONFIG_FILES-"Source/InitialConfigureFlags.cmake Makefile Source/Makefile"}
+CONFIG_FILES=\${CONFIG_FILES-"Source/InitialConfigureFlags.cmake Source/bootstrap/Makefile"}
EOF
cat >> $CONFIG_STATUS <<\EOF
for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
@@ -1433,8 +1433,8 @@ rm -fr confdefs* $ac_clean_files
test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
# build cmake
-$RUNMAKE
+(cd Source/bootstrap; $RUNMAKE)
# run cmake
-./Source/cmake $fullSrcDir
+./Source/bootstrap/cmake $fullSrcDir
# run cmake depends
$RUNMAKE depend