From d792e71110b60dee1cd3044be543f6cd96d45e50 Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Thu, 27 May 2010 13:34:40 +0000 Subject: [PATCH] Don't forget / to separate pathes... --- crlcore/etc/CMakeLists.txt | 2 +- crlcore/src/ccore/Environment.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crlcore/etc/CMakeLists.txt b/crlcore/etc/CMakeLists.txt index cfa13cd3..dd862562 100644 --- a/crlcore/etc/CMakeLists.txt +++ b/crlcore/etc/CMakeLists.txt @@ -1,7 +1,7 @@ install ( FILES environment.alliance.xml DESTINATION ${SYS_CONF_DIR}/coriolis2 ) install ( FILES technology.symbolic.xml DESTINATION ${SYS_CONF_DIR}/coriolis2 ) install ( FILES technology.cmos130.s2r.xml DESTINATION ${SYS_CONF_DIR}/coriolis2 ) - install ( FILES technology.mos65.s2r.xml DESTINATION ${SYS_CONF_DIR}/coriolis2 ) + install ( FILES technology.cmos65.s2r.xml DESTINATION ${SYS_CONF_DIR}/coriolis2 ) install ( FILES technology.freePDK45.s2r.xml DESTINATION ${SYS_CONF_DIR}/coriolis2 ) install ( FILES technology.fake.s2r.xml DESTINATION ${SYS_CONF_DIR}/coriolis2 ) install ( FILES display.xml DESTINATION ${SYS_CONF_DIR}/coriolis2 ) diff --git a/crlcore/src/ccore/Environment.cpp b/crlcore/src/ccore/Environment.cpp index 39a9c45d..2dc55cb8 100644 --- a/crlcore/src/ccore/Environment.cpp +++ b/crlcore/src/ccore/Environment.cpp @@ -212,7 +212,7 @@ namespace { if ( sysConfDir[0] == '/' ) envPath = sysConfDir + "/coriolis2/environment.alliance.xml" ; else - envPath = env.getCORIOLIS_TOP() + sysConfDir + "/coriolis2/environment.alliance.xml" ; + envPath = env.getCORIOLIS_TOP() + "/" + sysConfDir + "/coriolis2/environment.alliance.xml" ; } return ep._load ( envPath, warnNotFound ); @@ -541,8 +541,8 @@ namespace CRL { _SYMBOLIC_TECHNOLOGY = sysConfDir + "/coriolis2/technology.symbolic.xml"; _DISPLAY = sysConfDir + "/coriolis2/display.xml"; } else { - _SYMBOLIC_TECHNOLOGY = _CORIOLIS_TOP + sysConfDir + "/coriolis2/technology.symbolic.xml"; - _DISPLAY = _CORIOLIS_TOP + sysConfDir + "/coriolis2/display.xml"; + _SYMBOLIC_TECHNOLOGY = _CORIOLIS_TOP + "/" + sysConfDir + "/coriolis2/technology.symbolic.xml"; + _DISPLAY = _CORIOLIS_TOP + "/" + sysConfDir + "/coriolis2/display.xml"; } setPOWER ( "vdd" );