From b33ebc0058f6dc5075267ecab17263f752dddeaa Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Tue, 18 Nov 2025 03:56:23 +0000 Subject: [PATCH] Version the install directory. --- CMakeLists.txt | 2 +- Config | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fb5cddb27..21b163abe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -153,7 +153,7 @@ endif() if(INSTDIR) set(CMAKE_INSTALL_PREFIX "${INSTDIR}") elseif(NOT CMAKE_INSTALL_PREFIX) - set(CMAKE_INSTALL_PREFIX "$ENV{HOME}/anope") + set(CMAKE_INSTALL_PREFIX "$ENV{HOME}/anope-@VERSION_MAJOR@-@VERSION_MINOR@") endif() # Set default paths for various directories if not already defined diff --git a/Config b/Config index 740df5664..9ccfaca19 100755 --- a/Config +++ b/Config @@ -14,6 +14,9 @@ # # SPDX-License-Identifier: GPL-2.0-only +SOURCE_DIR="$(cd "$(dirname "$0")" && pwd)" +. $SOURCE_DIR/src/version.sh + Load_Cache () { if [ -f $SOURCE_DIR/config.cache -a -r $SOURCE_DIR/config.cache -a ! "$IGNORE_CACHE" ] ; then echo "Using defaults from config.cache. To ignore, $SOURCE_DIR/Config -nocache" @@ -81,7 +84,7 @@ Run_Build_System () { # Init values ########################################################################### -INSTDIR=$HOME/anope +INSTDIR="${HOME}/anope-${VERSION_MAJOR}.${VERSION_MINOR}" RUNGROUP= UMASK= DEBUG="no" @@ -89,7 +92,6 @@ EXTRA_INCLUDE_DIRS= EXTRA_LIB_DIRS= EXTRA_CONFIG_ARGS= CAN_QUICK="no" -SOURCE_DIR="$(cd "$(dirname "$0")" && pwd)" ########################################################################### # Check out the options @@ -141,7 +143,6 @@ fi if [ ! "$NO_INTRO" ] ; then export MORE='-e' - . $SOURCE_DIR/src/version.sh cat $SOURCE_DIR/.BANNER | sed "s/CURVER/$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH$VERSION_EXTRA/" | sed "s@SOURCE_DIR@$SOURCE_DIR@" | more echo "" else