Jerry James b72b28
--- ./configure.orig	2012-05-21 08:42:52.000000000 -0600
Jerry James b72b28
+++ ./configure	2012-08-15 14:00:11.360607877 -0600
Jerry James b72b28
@@ -4073,7 +4073,7 @@ $as_echo "no" >&6; }
574c35
 fi
574c35
 
574c35
 
574c35
-gapdir=`pwd`
Jerry James b72b28
+gapdir=/usr/lib/gap
574c35
 
Jerry James b72b28
 
Jerry James b72b28
 
Jerry James b72b28
--- ./cnf/gac.in.orig	2012-03-23 09:17:36.000000000 -0600
Jerry James b72b28
+++ ./cnf/gac.in	2012-08-15 14:00:17.299605327 -0600
Jerry James b72b28
@@ -55,16 +55,16 @@
Jerry James b72b28
 ##  option is appended at the end of the link command after the .o
Jerry James b72b28
 ##  files to link.
574c35
 ##
574c35
-gap_bin=@gapbin@
574c35
+gap_bin=/usr/include/gap
574c35
 
574c35
 if [ "X${gap_bin}" = "X$0" ];  then
574c35
     gap_dir="../../";
574c35
     gap_compiler="./gap";
574c35
     gap_binary="./";
574c35
 else
574c35
-    gap_dir="${gap_bin}/../..";
574c35
-    gap_compiler="${gap_bin}/gap";
574c35
-    gap_binary="${gap_bin}";
574c35
+    gap_dir=/usr/lib/gap;
574c35
+    gap_compiler=/usr/bin/gap;
574c35
+    gap_binary=${gap_dir}/bin/@gaparch@;
574c35
 fi
574c35
 gap_options=""
574c35
 gap_include="${gap_dir}/src"
Jerry James b72b28
@@ -119,9 +119,9 @@ gap_compile () {
574c35
 ##
574c35
 c_compile () {
574c35
     echo ${c_compiler}  $3 -o $1 -I${gap_dir} \
574c35
-         -I${gap_bin} -DCONFIG_H -c $2
574c35
+         -I${gap_bin} -I${gap_binary} -DCONFIG_H -c $2
574c35
     ${c_compiler} $3 -o $1 -I${gap_dir} \
Jerry James b72b28
-         -I${gap_bin} -DCONFIG_H -c $2 || exit 1
Jerry James b72b28
+         -I${gap_bin} -I${gap_binary} -DCONFIG_H -c $2 || exit 1
574c35
 }
574c35
 
574c35
 
Jerry James b72b28
@@ -385,17 +385,17 @@ make_compstat () {
574c35
     objects="${gactmp}/$$compstat.o ${objects}"
574c35
 }
574c35
 
574c35
-make_tmpdir () {
574c35
-    basetmp=${TMPDIR:-/tmp}; #honor the TMPDIR environment variable.
574c35
-    gactmp="$basetmp/gac$$";
574c35
-    mkdir "$gactmp" || exit 1;
574c35
-}
574c35
+#make_tmpdir () {
574c35
+#    basetmp=${TMPDIR:-/tmp}; #honor the TMPDIR environment variable.
574c35
+#    gactmp="$basetmp/gac$$";
574c35
+#    mkdir "$gactmp" || exit 1;
574c35
+#}
574c35
 
574c35
 #On systems with mktemp(1) this function is better:
574c35
-#make_tmpdir ()
574c35
-#{
574c35
-#    gactmp=`mktemp -d -t "gacXXXXXXX"`;
574c35
-#}
574c35
+make_tmpdir ()
574c35
+{
574c35
+    gactmp=`mktemp -d -t "gacXXXXXXX"`;
574c35
+}
574c35
 
574c35
 #############################################################################
574c35
 ##