Move Anope's executable (anope.exe for Windows / services for *nix) to be installed to the bin subdirectory, primarily for the Windows package.

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1938 5417fbe8-f217-4b02-8779-1006273d7864

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

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
 )

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

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)