From c08aaa86d1ada72ad6e185837f9c179693b60c22 Mon Sep 17 00:00:00 2001
From: Sadie Powell <sadie@witchery.services>
Date: Tue, 2 Apr 2024 16:50:24 +0100
Subject: Sync the build system directory names with the core.

---
 modules/CMakeLists.txt           | 4 ++--
 modules/webcpanel/CMakeLists.txt | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'modules')

diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt
index c6a98df7f..aa9e963c4 100644
--- a/modules/CMakeLists.txt
+++ b/modules/CMakeLists.txt
@@ -94,7 +94,7 @@ macro(build_modules SRC)
             target_link_libraries(${SO} ${PROGRAM_NAME})
           endif()
           # Set the module to be installed to the module directory under the data directory
-          install(TARGETS ${SO} DESTINATION ${LIB_DIR}/modules)
+          install(TARGETS ${SO} DESTINATION ${MODULE_DIR})
         endif()
       endif()
     endforeach()
@@ -168,7 +168,7 @@ macro(build_subdir)
   endif()
 
   # Set the module to be installed to the module directory under the data directory
-  install(TARGETS ${SO} DESTINATION ${LIB_DIR}/modules)
+  install(TARGETS ${SO} DESTINATION ${MODULE_DIR})
 endmacro()
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/modules/webcpanel/CMakeLists.txt b/modules/webcpanel/CMakeLists.txt
index 0770fddb7..ab19f12b5 100644
--- a/modules/webcpanel/CMakeLists.txt
+++ b/modules/webcpanel/CMakeLists.txt
@@ -1,5 +1,5 @@
 build_subdir(${CMAKE_CURRENT_SOURCE_DIR})
 
 install(DIRECTORY "templates/"
-  DESTINATION "${DB_DIR}/webcpanel/templates/default"
+  DESTINATION "${DATA_DIR}/webcpanel/templates/default"
 )
-- 
cgit