CONFIGURE: Fix for bug #3085292 (--docdir not accepted)

- Handle the --docdir option which was documented but not accepted.
- Reorder the directory variables and their handling to have the same order
  everywhere. This will hopefully make bugs like this harder to happen.

svn-id: r53149

1 files changed, 17 insertions, 14 deletions

diff --git a/configure b/configure
index 0536bbf6a2..8948a798e2 100755
--- a/configure
+++ b/configure
@@ -175,15 +175,15 @@ NASM=""
 # to make it possible to change e.g. the location of the
 # man pages independently of that of the engine data files,
 # which are placed inside $datadir/scummvm
-exec_prefix=NONE
 prefix=NONE
+exec_prefix=NONE
 bindir='${exec_prefix}/bin'
+libdir='${exec_prefix}/lib'
 datarootdir='${prefix}/share'
 datadir='${datarootdir}/scummvm'
+mandir='${datarootdir}/man'
 docdir='${datarootdir}/doc/scummvm'
-libdir='${exec_prefix}/lib'
 #localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
 
 # For cross compiling
 _host=""
@@ -762,8 +762,8 @@ for ac_option in $@; do
 	--disable-hq-scalers)     _build_hq_scalers=no ;;
 	--enable-alsa)            _alsa=yes       ;;
 	--disable-alsa)           _alsa=no        ;;
-	--enable-seq-midi)        _seq_midi=yes        ;;
-	--disable-seq-midi)       _seq_midi=no         ;;
+	--enable-seq-midi)        _seq_midi=yes   ;;
+	--disable-seq-midi)       _seq_midi=no    ;;
 	--enable-vorbis)          _vorbis=yes     ;;
 	--disable-vorbis)         _vorbis=no      ;;
 	--enable-tremor)          _tremor=yes     ;;
@@ -880,17 +880,17 @@ for ac_option in $@; do
 	--host=*)
 		_host=`echo $ac_option | cut -d '=' -f 2`
 		;;
-	--exec-prefix=*)
-		exec_prefix=`echo $ac_option | cut -d '=' -f 2`
-		;;
 	--prefix=*)
 		prefix=`echo $ac_option | cut -d '=' -f 2`
 		;;
+	--exec-prefix=*)
+		exec_prefix=`echo $ac_option | cut -d '=' -f 2`
+		;;
 	--bindir=*)
 		bindir=`echo $ac_option | cut -d '=' -f 2`
 		;;
-	--mandir=*)
-		mandir=`echo $ac_option | cut -d '=' -f 2`
+	--libdir=*)
+		libdir=`echo $ac_option | cut -d '=' -f 2`
 		;;
 	--datarootdir=*)
 		datarootdir=`echo $ac_option | cut -d '=' -f 2`
@@ -898,8 +898,11 @@ for ac_option in $@; do
 	--datadir=*)
 		datadir=`echo $ac_option | cut -d '=' -f 2`
 		;;
-	--libdir=*)
-		libdir=`echo $ac_option | cut -d '=' -f 2`
+	--mandir=*)
+		mandir=`echo $ac_option | cut -d '=' -f 2`
+		;;
+	--docdir=*)
+		docdir=`echo $ac_option | cut -d '=' -f 2`
 		;;
 	--enable-all-engines)
 		engine_enable_all
@@ -2932,11 +2935,11 @@ NASMFLAGS := $NASMFLAGS
 prefix = $prefix
 exec_prefix = $exec_prefix
 bindir = $bindir
+libdir = $libdir
 datarootdir = $datarootdir
 datadir = $datadir
-docdir = $docdir
-libdir = $libdir
 mandir = $mandir
+docdir = $docdir
 
 $_config_mk_data