diff options
| -rw-r--r-- | CMakeLists.txt | 14 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/Makefile | 5 | ||||
| -rw-r--r-- | src/main.c | 2 |
4 files changed, 12 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 71c7fd41d..29674c383 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -536,9 +536,9 @@ endif(NOT WIN32 AND RUNGROUP) # On Windows platforms, install extra files if(WIN32) install(FILES ${Anope_SOURCE_DIR}/anope.bat - ${Anope_SOURCE_DIR}/Changes - ${Anope_SOURCE_DIR}/Changes.conf - ${Anope_SOURCE_DIR}/Changes.lang + DESTINATION bin + ) + install(FILES ${Anope_SOURCE_DIR}/Changes ${Anope_SOURCE_DIR}/Changes.conf ${Anope_SOURCE_DIR}/Changes.lang DESTINATION . ) endif(WIN32) @@ -565,10 +565,10 @@ if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake") set(CPACK_PACKAGE_INSTALL_DIRECTORY "Anope") set(CPACK_PACKAGE_EXECUTABLES "") set(CPACK_NSIS_MENU_LINKS - "${SERVICES_BINARY}" "Anope IRC Services" - "anope.bat\\\" \\\"-debug -nofork" "Anope IRC Services (Debug and Window Logging)" - "anope.bat\\\" \\\"-nofork" "Anope IRC Services (Window Logging)" - "anope.bat\\\" \\\"-nothird" "Anope IRC Services (No Third Party Modules)" + "bin\\\\${SERVICES_BINARY}" "Anope IRC Services" + "bin\\\\anope.bat\\\" \\\"-debug -nofork" "Anope IRC Services (Debug and Window Logging)" + "bin\\\\anope.bat\\\" \\\"-nofork" "Anope IRC Services (Window Logging)" + "bin\\\\anope.bat\\\" \\\"-nothird" "Anope IRC Services (No Third Party Modules)" "http://www.anope.org" "Anope Web Site" ) # The following doesn't work, but a bug report has been filed about it diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d8ed60083..6e700db49 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -73,5 +73,5 @@ add_subdirectory(tools) # Set Anope to be installed to the bin directory install(TARGETS ${PROGRAM_NAME} - DESTINATION . + DESTINATION bin ) diff --git a/src/Makefile b/src/Makefile index b8e41db96..aa69c9f2f 100644 --- a/src/Makefile +++ b/src/Makefile @@ -109,8 +109,9 @@ spotless: install: services test -d ${INSTDIR} || mkdir ${INSTDIR} - $(INSTALL) services $(INSTDIR)/services - $(INSTALL) bin/anoperc $(INSTDIR)/anoperc + test -d ${INSTDIR}/bin || mkdir ${INSTDIR}/bin + $(INSTALL) services $(INSTDIR)/bin/services + $(INSTALL) bin/anoperc $(INSTDIR)/bin/anoperc test -d ${INSTDIR}/data || mkdir ${INSTDIR}/data (cd ../lang ; $(MAKE) install) $(CP) ../data/* $(INSTDIR)/data diff --git a/src/main.c b/src/main.c index 30cbbdc11..d83ad4e1b 100644 --- a/src/main.c +++ b/src/main.c @@ -512,7 +512,7 @@ int main(int ac, char **av, char **envp) #endif binary_dir = GetFullProgDir(av[0]); - services_dir = binary_dir + "/data"; + services_dir = binary_dir + "/../data"; /* General initialization first */ if ((i = init_primary(ac, av)) != 0) |