aboutsummaryrefslogtreecommitdiffhomepage
path: root/configure
diff options
context:
space:
mode:
authorGravatar pboutill <pboutill@85f007b7-540e-0410-9357-904b9bb8a0f7>2012-01-16 10:10:15 +0000
committerGravatar pboutill <pboutill@85f007b7-540e-0410-9357-904b9bb8a0f7>2012-01-16 10:10:15 +0000
commitdab6e90c7972ef2565c224444900d782f0dd75f9 (patch)
treee1959bff4ce1ad269166ea27c7d7e2b1b155769c /configure
parent5e504da68880df361ca1af3692e38498b1605463 (diff)
Bug 2676: ./configure --prefix shoudn't ask for a config directory.
I am not really happy of /etc/xdg/coq ... git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@14906 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure13
1 files changed, 9 insertions, 4 deletions
diff --git a/configure b/configure
index 2349000e5..a6ccecbca 100755
--- a/configure
+++ b/configure
@@ -795,10 +795,15 @@ case $libdir_spec in
*) LIBDIR_OPTION="None";;
esac
-case $configdir_spec/$local in
- yes/*) CONFIGDIR=$configdir;;
- */true) CONFIGDIR=$COQTOP/ide
- configdir_spec=yes;;
+case $configdir_spec/$prefix_spec/$local in
+ yes/*/*) CONFIGDIR=$configdir;;
+ */yes/*) configdir_spec=yes
+ case $ARCH in
+ win32) CONFIGDIR=$prefix/config;;
+ *) CONFIGDIR=$prefix/etc/xdg/coq;;
+ esac;;
+ */*/true) CONFIGDIR=$COQTOP/ide
+ configdir_spec=yes;;
*) printf "Where should I install the Coqide configuration files [$configdir_def]? "
read CONFIGDIR
case $CONFIGDIR in