Commit b5b46599 authored by Andy Cedilnik's avatar Andy Cedilnik

Revert to make it work again

parent a8d3805e
......@@ -1179,7 +1179,7 @@ done
ac_given_srcdir=$srcdir
trap 'rm -fr `echo "Source/InitialConfigureFlags.cmake Source/bootstrap/Makefile Source/cmConfigure.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
trap 'rm -fr `echo "Source/InitialConfigureFlags.cmake Makefile Source/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 Source/bootstrap/Makefile"}
CONFIG_FILES=\${CONFIG_FILES-"Source/InitialConfigureFlags.cmake Makefile Source/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
(cd Source/bootstrap; $RUNMAKE)
$RUNMAKE
# run cmake
./Source/bootstrap/cmake $fullSrcDir
./Source/cmake $fullSrcDir
# run cmake depends
$RUNMAKE depend
......@@ -143,10 +143,10 @@ fi
# find make to use to build cmake, prefer gmake
AC_PATH_PROGS(RUNMAKE, gmake make)
AC_OUTPUT(Source/InitialConfigureFlags.cmake Source/bootstrap/Makefile)
AC_OUTPUT(Source/InitialConfigureFlags.cmake Makefile Source/Makefile)
# build cmake
(cd Source/bootstrap; $RUNMAKE)
$RUNMAKE
# run cmake
./Source/bootstrap/cmake $fullSrcDir
./Source/cmake $fullSrcDir
# run cmake depends
$RUNMAKE depend
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment