Moved the tools executables to the bin directory, and fix anoperc's install location to also be bin.

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

src/bin/CMakeLists.txt

@@ -2,7 +2,7 @@
 if(NOT WIN32)
   configure_file(${Anope_SOURCE_DIR}/src/bin/anoperc.in ${Anope_BINARY_DIR}/src/bin/anoperc)
   install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/anoperc
-    DESTINATION .
+    DESTINATION bin
   )
   # Add anoperc to list of files for CPack to ignore
   add_to_cpack_ignored_files("anoperc$")

src/tools/CMakeLists.txt

@@ -19,9 +19,9 @@ foreach(SRC ${TOOLS_SRCS})
   add_executable(${EXE} ${SRC})
   set_target_properties(${EXE} PROPERTIES LINKER_LANGUAGE CXX LINK_FLAGS "${LDFLAGS}")
   add_dependencies(${EXE} ${PROGRAM_NAME})
-  # Set the executable to be installed to the tools directory under the bin directory
+  # Set the executable to be installed to the bin directory under the main directory
   install(TARGETS ${EXE}
-    DESTINATION tools
+    DESTINATION bin
   )
   # Add the executable to the list of files for CPack to ignore
   get_target_property(EXE_BINARY ${EXE} LOCATION)

src/tools/Makefile

@@ -35,9 +35,9 @@ spotless: clean
 
 install: anopesmtp db-merger db-convert
 	test -d ${INSTDIR} || mkdir ${INSTDIR}
-	test -d $(INSTDIR)/tools || mkdir $(INSTDIR)/tools
-	$(INSTALL) anopesmtp $(INSTDIR)/tools/anopesmtp
-	$(INSTALL) db-merger $(INSTDIR)/tools/db-merger
-	$(INSTALL) db-convert $(INSTDIR)/tools/db-convert
+	test -d $(INSTDIR)/bin || mkdir $(INSTDIR)/bin
+	$(INSTALL) anopesmtp $(INSTDIR)/bin/anopesmtp
+	$(INSTALL) db-merger $(INSTDIR)/bin/db-merger
+	$(INSTALL) db-convert $(INSTDIR)/bin/db-convert
 
 DUMMY: