diff options
| author | cyberbotx <cyberbotx@5417fbe8-f217-4b02-8779-1006273d7864> | 2009-01-26 23:07:11 +0000 |
|---|---|---|
| committer | cyberbotx <cyberbotx@5417fbe8-f217-4b02-8779-1006273d7864> | 2009-01-26 23:07:11 +0000 |
| commit | 4f312227d79180ee5927c3d5cfec03e216024b13 (patch) | |
| tree | c092e2785698376d805445d6f08fb8198c4758e9 /src | |
| parent | c1df37e5ba84a922eded445bf312520567724d66 (diff) | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/tools/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/tools/Makefile | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/bin/CMakeLists.txt b/src/bin/CMakeLists.txt index 9bdbb23dd..22bcc08bf 100644 --- a/src/bin/CMakeLists.txt +++ b/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$") 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: |