[Scummvm-cvs-logs] scummvm master -> 79632ea958537b23452c62dcc3ed809577d54495

sev- sev at scummvm.org
Fri Aug 26 18:56:21 CEST 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
79632ea958 CONFIGURE: Fixes to MacPort detection


Commit: 79632ea958537b23452c62dcc3ed809577d54495
    https://github.com/scummvm/scummvm/commit/79632ea958537b23452c62dcc3ed809577d54495
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2011-08-26T09:51:32-07:00

Commit Message:
CONFIGURE: Fixes to MacPort detection

Changed paths:
    configure



diff --git a/configure b/configure
index eca9005..278b917 100755
--- a/configure
+++ b/configure
@@ -1828,16 +1828,18 @@ case $_host_os in
 		# There is no way to get the prefix, so implementing a hack here
 		macport_version=`port version 2>/dev/null`
 		if test "$?" -eq 0; then
-			macport_version="`echo "${macport_version}" } sed -ne 's/Version: \([0-9]\.[0-9]\.[0-9]\)/\1/gp'`"
+			macport_version="`echo "${macport_version}" | sed -ne 's/Version: \([0-9]\.[0-9]\.[0-9]\)/\1/gp'sed -ne 's/Version: \([0-9]\.[0-9]\.[0-9]\)/\1/gp'`"
 			echo_n "You seem to be running MacPorts version ${macport_version}..."
 
-			$macport_prefix=`which port`
-			$macport_prefix=`dirname ${macport_prefix}`
+			macport_prefix=`which port`
+			# strip off /bin/port from /opt/local/bin/port
+			macport_prefix=`dirname ${macport_prefix}`
+			macport_prefix=`dirname ${macport_prefix}`
 
 			echo "adding ${macport_prefix} to paths"
 
 			LDFLAGS="-L${macport_prefix}/lib $LDFLAGS"
-			CXXFLAGS="-I${macport_prefix}/lib $CXXFLAGS"
+			CXXFLAGS="-I${macport_prefix}/include $CXXFLAGS"
 		fi
 		;;
 	dreamcast)






More information about the Scummvm-git-logs mailing list