From 1a7a4a3d89d7048e5c69998b80e224273cece794 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Christian=20G=C3=B6ttsche?= Date: Thu, 16 Jan 2020 16:02:58 +0100 Subject: [PATCH] [Minor] remove unused examplesdir --- CMakeLists.txt | 3 +-- cmake/Paths.cmake | 5 ----- config.h.in | 1 - 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 155e317ff..a393164de 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -627,7 +627,6 @@ CONFIGURE_FILE(config.h.in src/config.h) # Configs INSTALL(CODE "FILE(MAKE_DIRECTORY \$ENV{DESTDIR}${CONFDIR})") INSTALL(CODE "FILE(MAKE_DIRECTORY \$ENV{DESTDIR}${SHAREDIR})") -INSTALL(CODE "FILE(MAKE_DIRECTORY \$ENV{DESTDIR}${EXAMPLESDIR})") INSTALL(CODE "FILE(MAKE_DIRECTORY \$ENV{DESTDIR}${LUALIBDIR})") INSTALL(CODE "FILE(MAKE_DIRECTORY \$ENV{DESTDIR}${PLUGINSDIR})") INSTALL(CODE "FILE(MAKE_DIRECTORY \$ENV{DESTDIR}${RULESDIR})") @@ -734,4 +733,4 @@ if(_PVS_STUDIO) ANALYZE ${PROJECT_NAME} rspamd-server rspamadm rspamc OUTPUT FORMAT errorfile LOG target_${PROJECT_NAME}.err) -endif() \ No newline at end of file +endif() diff --git a/cmake/Paths.cmake b/cmake/Paths.cmake index 475c6f0fe..858cdc265 100644 --- a/cmake/Paths.cmake +++ b/cmake/Paths.cmake @@ -5,7 +5,6 @@ # RUNDIR - for runtime files # DBDIR - for static files # LOGDIR - for log files -# EXAMPLESDIR - for examples files IF(NOT CONFDIR) SET(CONFDIR "${CMAKE_INSTALL_PREFIX}/etc/rspamd") @@ -35,10 +34,6 @@ IF(NOT SHAREDIR) SET(SHAREDIR "${CMAKE_INSTALL_PREFIX}/share/rspamd") ENDIF(NOT SHAREDIR) -IF(NOT EXAMPLESDIR) - SET(EXAMPLESDIR "${CMAKE_INSTALL_PREFIX}/share/examples/rspamd") -ENDIF(NOT EXAMPLESDIR) - IF(NOT LUALIBDIR) SET(LUALIBDIR "${SHAREDIR}/lualib") ENDIF(NOT LUALIBDIR) diff --git a/config.h.in b/config.h.in index 04a5a8010..e711af6d6 100644 --- a/config.h.in +++ b/config.h.in @@ -217,7 +217,6 @@ #define RSPAMD_RUNDIR "${RUNDIR}" #define RSPAMD_LOGDIR "${LOGDIR}" #define RSPAMD_DBDIR "${DBDIR}" -#define RSPAMD_EXAMPLESDIR "${EXAMPLESDIR}" #define RSPAMD_PLUGINSDIR "${PLUGINSDIR}" #define RSPAMD_LUALIBDIR "${LUALIBDIR}" #define RSPAMD_RULESDIR "${RULESDIR}" -- 2.39.5