[Scummvm-cvs-logs] SF.net SVN: scummvm:[53150] scummvm/branches/branch-1-2-0/configure

[jvprat at users.sourceforge.net]

Revision: 53150
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53150&view=rev
Author:   jvprat
Date:     2010-10-11 19:54:55 +0000 (Mon, 11 Oct 2010)

Log Message:
-----------
CONFIGURE: Backport of r53149 (Fix for bug #3085292)

Modified Paths:
--------------
    scummvm/branches/branch-1-2-0/configure

Modified: scummvm/branches/branch-1-2-0/configure
===================================================================
--- scummvm/branches/branch-1-2-0/configure	2010-10-11 19:50:17 UTC (rev 53149)
+++ scummvm/branches/branch-1-2-0/configure	2010-10-11 19:54:55 UTC (rev 53150)
@@ -174,15 +174,15 @@
 # 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
+prefix=NONE
 exec_prefix=NONE
-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=""
@@ -761,8 +761,8 @@
 	--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     ;;
@@ -879,17 +879,17 @@
 	--host=*)
 		_host=`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`
 		;;
-	--prefix=*)
-		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`
@@ -897,9 +897,12 @@
 	--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
 		;;
@@ -2939,11 +2942,11 @@
 prefix = $prefix
 exec_prefix = $exec_prefix
 bindir = $bindir
+libdir = $libdir
 datarootdir = $datarootdir
 datadir = $datadir
+mandir = $mandir
 docdir = $docdir
-libdir = $libdir
-mandir = $mandir
 
 $_config_mk_data
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.