* config/open-axiom.m4 (ac_default_prefix): Set to C:/OpenAxiom on

	Windows platforms.

4 files changed, 24 insertions, 21 deletions

diff --git a/ChangeLog b/ChangeLog
index ccc6a3e6..821c0c92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-06  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
+	* config/open-axiom.m4 (ac_default_prefix): Set to C:/OpenAxiom on
+	Windows platforms.
+
 2011-07-05  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
 	* config/open-axiom.m4: Don't test for GMP, just yet.
diff --git a/config/open-axiom.m4 b/config/open-axiom.m4
index 2e8ef1a2..4fef7459 100644
--- a/config/open-axiom.m4
+++ b/config/open-axiom.m4
@@ -566,13 +566,12 @@ dnl the system is up and running.
 AC_DEFUN([OPENAXIOM_HOST_EDITOR],[
 AC_SUBST(oa_editor)
 ## On Windows system, we prefer the default installation
-## location to be 'C:/Program Files/OpenAxiom', following Windows 
-## convention.  We cannot use AC_PREFIX_DEFAULT directly as it seems 
-## to operate unconditionally.  Therefore, we resort to this dirty
-## trick stepping over Autoconf's internals.
+## location to be 'C:/OpenAxiom'.  We cannot use AC_PREFIX_DEFAULT
+## directly as it seems to operate unconditionally.  Therefore, we 
+## resort to this dirty trick stepping over Autoconf's internals.
 case $host in
     *mingw*)
-        ac_default_prefix="C:/Program Files/OpenAxiom"
+        ac_default_prefix="C:/OpenAxiom"
         AC_PATH_PROGS([oa_editor],[notepad.exe])
 	;;
     *)  
diff --git a/configure b/configure
index def5af71..fd2322d3 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for OpenAxiom 1.5.0-2011-06-30.
+# Generated by GNU Autoconf 2.65 for OpenAxiom 1.5.0-2011-07-06.
 #
 # Report bugs to <open-axiom-bugs@lists.sf.net>.
 #
@@ -701,8 +701,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='OpenAxiom'
 PACKAGE_TARNAME='openaxiom'
-PACKAGE_VERSION='1.5.0-2011-06-30'
-PACKAGE_STRING='OpenAxiom 1.5.0-2011-06-30'
+PACKAGE_VERSION='1.5.0-2011-07-06'
+PACKAGE_STRING='OpenAxiom 1.5.0-2011-07-06'
 PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net'
 PACKAGE_URL=''
 
@@ -1493,7 +1493,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures OpenAxiom 1.5.0-2011-06-30 to adapt to many kinds of systems.
+\`configure' configures OpenAxiom 1.5.0-2011-07-06 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1568,7 +1568,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of OpenAxiom 1.5.0-2011-06-30:";;
+     short | recursive ) echo "Configuration of OpenAxiom 1.5.0-2011-07-06:";;
    esac
   cat <<\_ACEOF
 
@@ -1679,7 +1679,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-OpenAxiom configure 1.5.0-2011-06-30
+OpenAxiom configure 1.5.0-2011-07-06
 generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2669,7 +2669,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by OpenAxiom $as_me 1.5.0-2011-06-30, which was
+It was created by OpenAxiom $as_me 1.5.0-2011-07-06, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
@@ -5570,7 +5570,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='openaxiom'
- VERSION='1.5.0-2011-06-30'
+ VERSION='1.5.0-2011-07-06'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -18872,13 +18872,12 @@ fi
 
 
 ## On Windows system, we prefer the default installation
-## location to be 'C:/Program Files/OpenAxiom', following Windows
-## convention.  We cannot use AC_PREFIX_DEFAULT directly as it seems
-## to operate unconditionally.  Therefore, we resort to this dirty
-## trick stepping over Autoconf's internals.
+## location to be 'C:/OpenAxiom'.  We cannot use AC_PREFIX_DEFAULT
+## directly as it seems to operate unconditionally.  Therefore, we
+## resort to this dirty trick stepping over Autoconf's internals.
 case $host in
     *mingw*)
-        ac_default_prefix="C:/Program Files/OpenAxiom"
+        ac_default_prefix="C:/OpenAxiom"
         for ac_prog in notepad.exe
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -21561,7 +21560,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by OpenAxiom $as_me 1.5.0-2011-06-30, which was
+This file was extended by OpenAxiom $as_me 1.5.0-2011-07-06, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -21627,7 +21626,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-OpenAxiom config.status 1.5.0-2011-06-30
+OpenAxiom config.status 1.5.0-2011-07-06
 configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index fa8454f4..1ad43419 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,7 +33,7 @@ dnl  Makefiles for building OpenAxiom interpreter, compiler, libraries, and
 dnl  auxiliary tools where appropriate.
 dnl
 
-AC_INIT([OpenAxiom], [1.5.0-2011-06-30], 
+AC_INIT([OpenAxiom], [1.5.0-2011-07-06], 
         [open-axiom-bugs@lists.sf.net])
 
 dnl Most of the macros used in this configure.ac are defined in files