summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Powell <petpow@saberuk.com>2015-12-15 00:27:21 +0000
committerPeter Powell <petpow@saberuk.com>2015-12-31 02:41:29 +0000
commit39980be37f8ddb7207a4873c52c20c028241c047 (patch)
tree32f242c4d998acf6968fc590b89efff1b1c9624c
parent9fbf16b6970f936a6ec66ed9a373976e4fe0cae6 (diff)
Replace INSTDIR with CMAKE_INSTALL_PREFIX.
-rw-r--r--CMakeLists.txt6
-rwxr-xr-xConfig2
2 files changed, 3 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8075b05d7..a6245dd48 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -171,10 +171,8 @@ endif()
find_program(CHGRP chgrp)
find_program(CHMOD chmod)
-# If a INSTDIR was passed in to CMake, use it as the install prefix, otherwise set the default install prefix to the services directory under the user's home directory
-if(INSTDIR)
- set(CMAKE_INSTALL_PREFIX "${INSTDIR}")
-elseif()
+# If CMAKE_INSTALL_PREFIX was not passed in to CMake set the default install prefix to the "anope" directory under the user's home directory
+if(NOT CMAKE_INSTALL_PREFIX)
set(CMAKE_INSTALL_PREFIX "$ENV{HOME}/anope")
endif()
diff --git a/Config b/Config
index a6789f092..eceb228ad 100755
--- a/Config
+++ b/Config
@@ -44,7 +44,7 @@ Run_Build_System () {
EXTRA_LIBS=""
if [ "$INSTDIR" != "" ] ; then
- WITH_INST="-DINSTDIR:STRING=$INSTDIR"
+ WITH_INST="-DCMAKE_INSTALL_PREFIX:STRING=$INSTDIR"
fi
if [ "$RUNGROUP" != "" ] ; then