diff -Naur crystalspace-src-1.2/scripts/cs-config/Jamfile crystalspace-src-1.2.tpg/scripts/cs-config/Jamfile
--- crystalspace-src-1.2/scripts/cs-config/Jamfile	2007-10-04 11:25:41.000000000 +0000
+++ crystalspace-src-1.2.tpg/scripts/cs-config/Jamfile	2008-04-21 13:09:30.000000000 +0000
@@ -94,14 +94,13 @@
 fi
 
 CS_VERSION=$(PACKAGE_VERSION_SIGNIFICANT)
-CRYSTAL="\${CRYSTAL-$(prefix)\$PATH_SEPARATOR.}"
+CRYSTAL="\${CRYSTAL-$(prefix)}"
 CRYSTAL_$(ENV_VERSION)="\${CRYSTAL_$(ENV_VERSION)-\$CRYSTAL}"
 my_IFS=\$IFS; IFS=\$PATH_SEPARATOR
 for p in \$CRYSTAL_$(ENV_VERSION)
 do
   prefix="\${p}"
   exec_prefix="\${prefix}"
-  makeout="$(LOCATE.OBJECTS)"
   version="$(PACKAGE_VERSION)"
   longversion="$(PACKAGE_STRING)"
   newincdir=""
diff -Naur crystalspace-src-1.2/scripts/cs-config/cs-config.temppost crystalspace-src-1.2.tpg/scripts/cs-config/cs-config.temppost
--- crystalspace-src-1.2/scripts/cs-config/cs-config.temppost	2007-10-04 11:25:39.000000000 +0000
+++ crystalspace-src-1.2.tpg/scripts/cs-config/cs-config.temppost	2008-04-21 13:09:30.000000000 +0000
@@ -1,40 +1,15 @@
 # Detect type of the installation and the directories where the library files
 # reside in.
-libdir=""
 lflags=""
+arch=$(/bin/arch)
+if [ "$arch" = "x86_64" -o "$arch" = "s390x" -o "$arch" = "ppc64" \
+    -o "$arch" = "ia64" ];
+then
+    libdir="/usr/lib64"
+else
+    libdir="/usr/lib"
+fi
 
-for libname in lib${libcrystalspace}.so \
-	       lib${libcrystalspace}.dylib \
-	       lib${libcrystalspace}.a \
-	       ; do
-    if test -r "$prefix/Jamfile" && \
-	test -r "$prefix/$makeout/libs/$libname"; then
-	libdir="$prefix/$makeout/libs"
-	lflags="-L$libdir"
-    elif test -z "$libdir" && test -r "${exec_prefix}/lib/$libname"; then
-	libdir="${exec_prefix}/lib"
-	lflags="-L${exec_prefix}/lib"
-    else
-	my_IFS=$IFS; IFS=$PATH_SEPARATOR
-	for p in $CRYSTAL
-	  do
-	  if test -r "$p/Jamfile" && \
-	      test -r "$p/$makeout/libs/$libname"; then
-	      libdir="$p/$makeout/libs"
-	      lflags="-L$libdir"
-	      break
-	  elif test -z "$libdir" && test -r "${p}/lib/$libname"; then
-	      libdir="${p}/lib"
-	      lflags="-L$libdir"
-	      break
-	  fi
-	done
-	IFS=$my_IFS
-    fi
-    if test -n "$lflags" ; then
-        break
-    fi
-done
 
 # Check for optional libs, add to list if present.
 
@@ -258,17 +233,6 @@
   shift
 done
 
-# This is tested late in order to allow --help to work even if the Crystal
-# Space directory is not found.
-if test -z "$lflags"; then
-  cat 1>&2 <<EOF
-Failed to detect directory containing Crystal Space link libraries; aborting!
-Did you build Crystal Space? Did you set the CRYSTAL environment variable
-correctly?
-EOF
-  exit 1
-fi
-
 inc_dir_shown=""
 my_IFS=$IFS; IFS=$PATH_SEPARATOR
 for p in $includedir