use relative paths for includes

ConfigFileParser.cpp

@@ -75,7 +75,7 @@ void ConfigFileParser::parse(const std::string& path) {
         if (c == '\n') {
           throw ParseExc(l, pos, ">", "<newline>", path);
         } else if (c == '>') {
-          parse(tmp);
+          parse(relPath(tmp, path));
           tmp.clear();
           s = NONE;
         } else {
@@ -353,3 +353,12 @@ void ConfigFileParser::updateVals(size_t sec, const KeyVals& kvs) {
     _kvs[sec][kv.first] = kv.second;
   }
 }
+
+// _____________________________________________________________________________
+std::string ConfigFileParser::relPath(const std::string& file,
+                                      std::string curF) const {
+  // pass absolute paths through unchanged
+  if (file.size() && file[0] == '/') return file;
+  curF.erase(std::find(curF.rbegin(), curF.rend(), '/').base(), curF.end());
+  return curF + "/" + file;
+}

ConfigFileParser.h

@@ -99,5 +99,6 @@ class ConfigFileParser {
   bool toBool(std::string str) const;
 
   void updateVals(size_t sec, const KeyVals& kvs);
+  std::string relPath(const std::string& file, std::string curFile) const;
 };
 }