summaryrefslogtreecommitdiff
blob: 505cf58bd3fe0c80b9dbb7908a8fdc48b68b4edf (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
--- charm/src/scripts/charmc-old	2007-04-24 14:13:21.000000000 -0500
+++ charm/src/scripts/charmc	2007-08-23 20:14:01.034374325 -0500
@@ -681,21 +681,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/lib"
+CHARMINC="/usr/include/gentoo-include"
+CHARMLIBSO="/usr/lib"
 
 ##############################################################################
 #