From 4f312227d79180ee5927c3d5cfec03e216024b13 Mon Sep 17 00:00:00 2001
From: cyberbotx <cyberbotx@5417fbe8-f217-4b02-8779-1006273d7864>
Date: Mon, 26 Jan 2009 23:07:11 +0000
Subject: 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/tools/CMakeLists.txt | 4 ++--
 src/tools/Makefile       | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/tools')

diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
index c281df5b5..6ac5d76a9 100644
--- a/src/tools/CMakeLists.txt
+++ b/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)
diff --git a/src/tools/Makefile b/src/tools/Makefile
index eb8b115ad..ace5b645e 100644
--- a/src/tools/Makefile
+++ b/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:
-- 
cgit