Browse Source

[Minor] remove unused examplesdir

pull/3217/head
Christian Göttsche 6 years ago
parent
commit
1a7a4a3d89
  1. 3
      CMakeLists.txt
  2. 5
      cmake/Paths.cmake
  3. 1
      config.h.in

3
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()
endif()

5
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)

1
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}"

Loading…
Cancel
Save