--- ./configure.orig	2007-10-04 09:05:16.000000000 -0600
+++ ./configure	2012-01-03 16:55:54.417003009 -0700
@@ -2764,7 +2764,7 @@ echo "${ECHO_T}no" >&6; }
 fi
 
 
-gapdir=`pwd`
+gapdir=/usr/share/gap
 mkdir -p bin
 ac_config_files="$ac_config_files Makefile sysinfo.gap:sysinfo.in bin/gap.sh:gap.shi"
 
--- ./cnf/gac.in.orig	2006-03-05 06:37:06.000000000 -0700
+++ ./cnf/gac.in	2012-01-03 16:59:18.237794244 -0700
@@ -51,16 +51,16 @@
 ##  The option '-P <option>' tells 'gac' to pass the option  <option> to  the
 ##  C linker.
 ##
-gap_bin=@gapbin@
+gap_bin=/usr/include/gap
 
 if [ "X${gap_bin}" = "X$0" ];  then
     gap_dir="../../";
     gap_compiler="./gap";
     gap_binary="./";
 else
-    gap_dir="${gap_bin}/../..";
-    gap_compiler="${gap_bin}/gap";
-    gap_binary="${gap_bin}";
+    gap_dir=/usr/lib/gap;
+    gap_compiler=/usr/bin/gap;
+    gap_binary=${gap_dir}/bin/@gaparch@;
 fi
 gap_options=""
 gap_include="${gap_dir}/src"
@@ -111,9 +111,9 @@ gap_compile () {
 ##
 c_compile () {
     echo ${c_compiler}  $3 -o $1 -I${gap_dir} \
-         -I${gap_bin} -DCONFIG_H -c $2
+         -I${gap_bin} -I${gap_binary} -DCONFIG_H -c $2
     ${c_compiler} $3 -o $1 -I${gap_dir} \
-         -I${gap_bin} -DCONFIG_H -c $2
+         -I${gap_bin} -I${gap_binary} -DCONFIG_H -c $2
 }
 
 
@@ -387,17 +387,17 @@ make_compstat () {
     objects="${gactmp}/$$compstat.o ${objects}"
 }
 
-make_tmpdir () {
-    basetmp=${TMPDIR:-/tmp}; #honor the TMPDIR environment variable.
-    gactmp="$basetmp/gac$$";
-    mkdir "$gactmp" || exit 1;
-}
+#make_tmpdir () {
+#    basetmp=${TMPDIR:-/tmp}; #honor the TMPDIR environment variable.
+#    gactmp="$basetmp/gac$$";
+#    mkdir "$gactmp" || exit 1;
+#}
 
 #On systems with mktemp(1) this function is better:
-#make_tmpdir ()
-#{
-#    gactmp=`mktemp -d -t "gacXXXXXXX"`;
-#}
+make_tmpdir ()
+{
+    gactmp=`mktemp -d -t "gacXXXXXXX"`;
+}
 
 #############################################################################
 ##