--- src/scripts/charmc 2009-11-27 02:24:30.648381166 -0600 +++ src/scripts/charmc.new 2009-11-27 02:31:06.150618002 -0600 @@ -343,19 +343,9 @@ PROG_EXT=".exe" fi -CHARMLIB="$CHARMBIN/../lib" -CHARMINC="$CHARMBIN/../include" -CHARMLIBSO= -if test -d "$CHARMBIN/../lib_so" -then - CHARMLIBSO=`cd $CHARMBIN/../lib_so 2>/dev/null && pwd` - #getting absolute path is harder than thought because of symbolic links and .. - #ksh needs cd -P to resolve werid symbolic links, however -P is not portable - #csh is ok too if it exists - test -z "$CHARMLIBSO" && CHARMLIBSO=`cd -P $CHARMBIN/../lib_so 2>/dev/null && pwd` - test -z "$CHARMLIBSO" && CHARMLIBSO=`csh -c "cd $CHARMBIN/../lib_so >& /dev/null && pwd"` - test -z "$CHARMLIBSO" && echo "$CHARMBIN/../lib_so: not found" && exit 1 -fi +CHARMLIB="/usr/gentoo-libdir" +CHARMINC="/usr/include/gentoo-include" +CHARMLIBSO="/usr/gentoo-libdir" ############################################################################## #