commit 840afd9db51b28bb9bdc771c3be2903ceeec3c3c
author Zhiyi Zhang <zhiyi@cs.ucla.edu> Wed Oct 21 13:24:08 2020 -0700
committer Zhiyi Zhang <zhiyi@cs.ucla.edu> Wed Oct 21 13:24:08 2020 -0700
tree d2ac956ea2be1f4bddb2fe7228a8915c78fc9d4c
parent 0fe1865d7a18f3f7cdef618c80609f3f3a4270b5

fix some errors

Change-Id: I0696d17e257d0956ea9fab0a6d20186504ce2d2f

src/detail/ndncert-common.hpp

diff --git a/src/detail/ndncert-common.hpp b/src/detail/ndncert-common.hpp
index 003b31f..d458147 100644
--- a/src/detail/ndncert-common.hpp
+++ b/src/detail/ndncert-common.hpp
@@ -21,7 +21,7 @@
 #ifndef NDNCERT_NDNCERT_COMMON_HPP
 #define NDNCERT_NDNCERT_COMMON_HPP
 
-#include "ndncert-config.hpp"
+#include "detail/ndncert-config.hpp"
 
 #ifdef NDNCERT_HAVE_TESTS
 #define NDNCERT_VIRTUAL_WITH_TESTS virtual

src/identity-challenge/challenge-credential.cpp

diff --git a/src/identity-challenge/challenge-credential.cpp b/src/identity-challenge/challenge-credential.cpp
index da47469..5ec176b 100644
--- a/src/identity-challenge/challenge-credential.cpp
+++ b/src/identity-challenge/challenge-credential.cpp
@@ -37,7 +37,7 @@
     : ChallengeModule("Credential", 1, time::seconds(1))
 {
   if (configPath.empty()) {
-    m_configFile = std::string(SYSCONFDIR) + "/ndncert/challenge-credential.conf";
+    m_configFile = std::string(NDNCERT_SYSCONFDIR) + "/ndncert/challenge-credential.conf";
   }
   else {
     m_configFile = configPath;

tools/ndncert-ca-server.cpp

diff --git a/tools/ndncert-ca-server.cpp b/tools/ndncert-ca-server.cpp
index 00cd3aa..17bf0f0 100644
--- a/tools/ndncert-ca-server.cpp
+++ b/tools/ndncert-ca-server.cpp
@@ -83,7 +83,7 @@
   terminateSignals.add(SIGTERM);
   terminateSignals.async_wait(handleSignal);
 
-  std::string configFilePath(SYSCONFDIR "/ndncert/ca.conf");
+  std::string configFilePath(NDNCERT_SYSCONFDIR "/ndncert/ca.conf");
   bool wantRepoOut = false;
 
   namespace po = boost::program_options;

tools/ndncert-client.cpp

diff --git a/tools/ndncert-client.cpp b/tools/ndncert-client.cpp
index 5c712a6..fc074a0 100644
--- a/tools/ndncert-client.cpp
+++ b/tools/ndncert-client.cpp
@@ -456,7 +456,7 @@
   terminateSignals.async_wait(handleSignal);
 
   namespace po = boost::program_options;
-  std::string configFilePath = std::string(SYSCONFDIR) + "/ndncert/client.conf";
+  std::string configFilePath = std::string(NDNCERT_SYSCONFDIR) + "/ndncert/client.conf";
   po::options_description description("General Usage\n ndncert-client [-h] [-c] [-v]\n");
   description.add_options()("help,h", "produce help message")("config-file,c", po::value<std::string>(&configFilePath), "configuration file name");
   po::positional_options_description p;