More strict detection of the configuration files install directory.

* Change: In Bootstrap, in FindBoostrap.cmake, install in system-wide
    directories /etc or /opt only if the the installation path is
    exactly /usr or /opt and not only beginning with it.
This commit is contained in:
Jean-Paul Chaput 2014-08-03 16:17:13 +02:00
parent 51a1615d92
commit b081d07bfc
1 changed files with 2 additions and 2 deletions

View File

@ -259,8 +259,8 @@
#
macro(setup_sysconfdir INSTALLDIR)
message("-- Checking installation directory <${INSTALLDIR}>")
string(REGEX MATCH "^/usr" IS_USR ${INSTALLDIR})
string(REGEX MATCH "^/opt" IS_OPT ${INSTALLDIR})
string(REGEX MATCH "^/usr$" IS_USR ${INSTALLDIR})
string(REGEX MATCH "^/opt$" IS_OPT ${INSTALLDIR})
if(IS_USR OR IS_OPT)
message("-- Using system-wide /etc.")
set(SYS_CONF_DIR "/etc" CACHE STRING "System configuration directory (/etc)" FORCE)