Merge pull request #43 from BenceJanosSzabo/master

[deliverable/titan.core.git] / common / config_preproc_p.y

diff --git a/common/config_preproc_p.y b/common/config_preproc_p.y
index e76ee4f07a61b32f3804bc94e555e6799bed4a2e..e2bfc7cd82c569a3c1fc1d1ba1ecc8ad159b7fc4 100644 (file)
--- a/common/config_preproc_p.y
+++ b/common/config_preproc_p.y
@@ -1,9 +1,18 @@
 /******************************************************************************
- * Copyright (c) 2000-2015 Ericsson Telecom AB
+ * Copyright (c) 2000-2016 Ericsson Telecom AB
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Balasko, Jeno
+ *   Baranyi, Botond
+ *   Beres, Szabolcs
+ *   Delic, Adam
+ *   Raduly, Csaba
+ *   Szabo, Bence Janos
+ *
  ******************************************************************************/
  
 %{
@@ -256,7 +265,7 @@ extern int add_include_file(const std::string& filename)
     expstring_t currdirname, dirname, filenamepart, basedir;
     currdirname = get_dir_from_path(get_cfg_preproc_current_file().c_str());
     dirname = get_dir_from_path(filename.c_str());
-    basedir = get_absolute_dir(dirname, currdirname);
+    basedir = get_absolute_dir(dirname, currdirname, 1);
     Free(currdirname);
     Free(dirname);
     filenamepart = get_file_from_path(filename.c_str());
@@ -294,7 +303,7 @@ extern int preproc_parse_file(const char *filename, string_chain_t **filenames,
   config_preproc_defines=string_map_new();
   {
     expstring_t dirname=get_dir_from_path(filename);
-    expstring_t basedir=get_absolute_dir(dirname, NULL);
+    expstring_t basedir=get_absolute_dir(dirname, NULL, 1);
     expstring_t filenamepart=get_file_from_path(filename);
     Free(dirname);
     if (basedir == NULL) {