diff options
| author | cyberbotx <cyberbotx@5417fbe8-f217-4b02-8779-1006273d7864> | 2009-01-26 20:39:00 +0000 |
|---|---|---|
| committer | cyberbotx <cyberbotx@5417fbe8-f217-4b02-8779-1006273d7864> | 2009-01-26 20:39:00 +0000 |
| commit | c1df37e5ba84a922eded445bf312520567724d66 (patch) | |
| tree | 09a7dbd891f89e363c82cf1fa652ab861b954efc /src | |
| parent | 0dac2dbc49bf13cb42bdac84fd1780d0ba63f4aa (diff) | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/Makefile | 5 | ||||
| -rw-r--r-- | src/main.c | 2 |
3 files changed, 5 insertions, 4 deletions
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) |