jcarr
/
coriolis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't forget / to separate pathes...

This commit is contained in:
Jean-Paul Chaput 2010-05-27 13:34:40 +00:00
parent 08aa1aa1ac
commit d792e71110
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crlcore/etc/CMakeLists.txt
View File

@ -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 )

6
crlcore/src/ccore/Environment.cpp
View File

@ -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" );