|
Jerry James |
1564e1e |
--- ./cnf/gac.in.orig 2014-05-24 14:02:53.000000000 -0600
|
|
Jerry James |
1564e1e |
+++ ./cnf/gac.in 2014-06-19 12:00:00.000000000 -0600
|
|
Jerry James |
b72b287 |
@@ -55,16 +55,16 @@
|
|
Jerry James |
b72b287 |
## option is appended at the end of the link command after the .o
|
|
Jerry James |
b72b287 |
## files to link.
|
|
|
574c352 |
##
|
|
|
574c352 |
-gap_bin=@gapbin@
|
|
|
574c352 |
+gap_bin=/usr/include/gap
|
|
|
574c352 |
|
|
|
574c352 |
if [ "X${gap_bin}" = "X$0" ]; then
|
|
|
574c352 |
gap_dir="../../";
|
|
|
574c352 |
gap_compiler="./gap";
|
|
|
574c352 |
gap_binary="./";
|
|
|
574c352 |
else
|
|
|
574c352 |
- gap_dir="${gap_bin}/../..";
|
|
|
574c352 |
- gap_compiler="${gap_bin}/gap";
|
|
|
574c352 |
- gap_binary="${gap_bin}";
|
|
|
574c352 |
+ gap_dir=/usr/lib/gap;
|
|
|
574c352 |
+ gap_compiler=/usr/bin/gap;
|
|
|
574c352 |
+ gap_binary=${gap_dir}/bin/@gaparch@;
|
|
|
574c352 |
fi
|
|
|
574c352 |
gap_options=""
|
|
|
574c352 |
gap_include="${gap_dir}/src"
|
|
Jerry James |
1564e1e |
@@ -172,9 +172,9 @@ gap_compile () {
|
|
|
574c352 |
##
|
|
|
574c352 |
c_compile () {
|
|
|
574c352 |
echo ${c_compiler} $3 -o $1 -I${gap_dir} \
|
|
|
574c352 |
- -I${gap_bin} -DCONFIG_H -c $2
|
|
|
574c352 |
+ -I${gap_bin} -I${gap_binary} -DCONFIG_H -c $2
|
|
|
574c352 |
${c_compiler} $3 -o $1 -I${gap_dir} \
|
|
Jerry James |
b72b287 |
- -I${gap_bin} -DCONFIG_H -c $2 || exit 1
|
|
Jerry James |
b72b287 |
+ -I${gap_bin} -I${gap_binary} -DCONFIG_H -c $2 || exit 1
|
|
|
574c352 |
}
|
|
|
574c352 |
|
|
|
574c352 |
|
|
Jerry James |
1564e1e |
@@ -440,17 +440,17 @@ make_compstat () {
|
|
|
574c352 |
objects="${gactmp}/$$compstat.o ${objects}"
|
|
|
574c352 |
}
|
|
|
574c352 |
|
|
|
574c352 |
-make_tmpdir () {
|
|
|
574c352 |
- basetmp=${TMPDIR:-/tmp}; #honor the TMPDIR environment variable.
|
|
|
574c352 |
- gactmp="$basetmp/gac$$";
|
|
|
574c352 |
- mkdir "$gactmp" || exit 1;
|
|
|
574c352 |
-}
|
|
|
574c352 |
+#make_tmpdir () {
|
|
|
574c352 |
+# basetmp=${TMPDIR:-/tmp}; #honor the TMPDIR environment variable.
|
|
|
574c352 |
+# gactmp="$basetmp/gac$$";
|
|
|
574c352 |
+# mkdir "$gactmp" || exit 1;
|
|
|
574c352 |
+#}
|
|
|
574c352 |
|
|
|
574c352 |
#On systems with mktemp(1) this function is better:
|
|
|
574c352 |
-#make_tmpdir ()
|
|
|
574c352 |
-#{
|
|
|
574c352 |
-# gactmp=`mktemp -d -t "gacXXXXXXX"`;
|
|
|
574c352 |
-#}
|
|
|
574c352 |
+make_tmpdir ()
|
|
|
574c352 |
+{
|
|
|
574c352 |
+ gactmp=`mktemp -d -t "gacXXXXXXX"`;
|
|
|
574c352 |
+}
|
|
|
574c352 |
|
|
|
574c352 |
#############################################################################
|
|
|
574c352 |
##
|
|
Jerry James |
1564e1e |
--- ./configure.orig 2014-05-24 14:02:53.000000000 -0600
|
|
Jerry James |
1564e1e |
+++ ./configure 2014-06-19 12:00:00.000000000 -0600
|
|
Jerry James |
f93ce6d |
@@ -4094,7 +4094,7 @@ $as_echo "no" >&6; }
|
|
Jerry James |
f93ce6d |
fi
|
|
Jerry James |
f93ce6d |
|
|
Jerry James |
f93ce6d |
|
|
Jerry James |
f93ce6d |
-gapdir=`pwd`
|
|
Jerry James |
f93ce6d |
+gapdir=/usr/lib/gap
|
|
Jerry James |
f93ce6d |
|
|
Jerry James |
f93ce6d |
|
|
Jerry James |
f93ce6d |
|