Mercurial > hg > orthanc
comparison OrthancServer/OrthancInitialization.cpp @ 88:8936a3bbb129
fix
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 26 Sep 2012 17:52:26 +0200 |
parents | 8517e2c44283 |
children | c35eee0cbd12 |
comparison
equal
deleted
inserted
replaced
87:8517e2c44283 | 88:8936a3bbb129 |
---|---|
48 printf("Using the configuration from: [%s]\n", configurationFile); | 48 printf("Using the configuration from: [%s]\n", configurationFile); |
49 } | 49 } |
50 else | 50 else |
51 { | 51 { |
52 #if ORTHANC_STANDALONE == 1 && defined(__linux) | 52 #if ORTHANC_STANDALONE == 1 && defined(__linux) |
53 // Under Linux, try and open "../etc/orthanc/Configuration.json" | 53 // Under Linux, try and open "../../etc/orthanc/Configuration.json" |
54 try | 54 try |
55 { | 55 { |
56 boost::filesystem::path p = ORTHANC_PATH; | 56 boost::filesystem::path p = Toolbox::GetDirectoryOfExecutable(); |
57 p = p.parent_path(); | 57 p = p.parent_path().parent_path(); |
58 p /= "etc"; | 58 p /= "etc"; |
59 p /= "orthanc"; | 59 p /= "orthanc"; |
60 p /= CONFIGURATION_FILE; | 60 p /= CONFIGURATION_FILE; |
61 | 61 |
62 Toolbox::ReadFile(content, p.string()); | 62 Toolbox::ReadFile(content, p.string()); |