From bbe86d08ba83425423c70b29d1ca757bf57a5e34 Mon Sep 17 00:00:00 2001 From: Jonathan Perkin Date: Thu, 1 Apr 2010 20:47:19 +0200 Subject: [PATCH] Expand @HOSTNAME@. --- scripts/CMakeLists.txt | 5 ++--- support-files/CMakeLists.txt | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index e85928a5c42..bfe65a0acd8 100755 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -134,11 +134,10 @@ ELSE() SET(CHECK_PID "kill -s SIGCONT $PID > /dev/null 2> /dev/null") ENDIF() +SET(HOSTNAME "hostname") + ENDIF(UNIX) - - - # Really ugly, one script, "mysql_install_db", needs prefix set to ".", # i.e. makes access relative the current directory. This matches # the documentation, so better not change this. diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt index 9cd373c6e9c..d748b4b195c 100644 --- a/support-files/CMakeLists.txt +++ b/support-files/CMakeLists.txt @@ -29,6 +29,7 @@ ELSE() SET(CXXFLAGS ${CMAKE_CXX_FLAGS}) SET(MYSQLD_USER "mysql") SET(ini_file_extension "cnf") + SET(HOSTNAME "hostname") ENDIF() # XXX: shouldn't we just have variables for all this stuff and centralise