[Scummvm-cvs-logs] CVS: scummvm configure,1.84,1.85

Max Horn fingolfin at users.sourceforge.net
Tue Apr 6 13:17:16 CEST 2004


Update of /cvsroot/scummvm/scummvm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv687

Modified Files:
	configure 
Log Message:
Fix building from external directory

Index: configure
===================================================================
RCS file: /cvsroot/scummvm/scummvm/configure,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- configure	5 Apr 2004 22:07:09 -0000	1.84
+++ configure	6 Apr 2004 20:04:05 -0000	1.85
@@ -47,6 +47,8 @@
 _sdlconfig=sdl-config
 _sdlpath="$PATH"
 
+_srcdir=`dirname $0`
+
 # For cross compiling
 _host=""
 _host_cpu=""
@@ -337,7 +339,7 @@
     _host_os=linux
     _host_cpu=arm
 else
-	guessed_host=`./config.guess`
+	guessed_host=`$_srcdir/config.guess`
     _host_cpu=`echo $guessed_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
     _host_os=`echo $guessed_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
     _host_vendor=`echo $guessed_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
@@ -932,7 +934,6 @@
 # TODO: Add a better check than just looking for 'Makefile'
 #
 if test ! -f Makefile ; then
-_srcdir=`dirname $0`
 echo "Creating Makefile"
 
 cat > Makefile << EOF





More information about the Scummvm-git-logs mailing list