[Scummvm-cvs-logs] SF.net SVN: scummvm:[44401] scummvm/trunk

dhewg at users.sourceforge.net dhewg at users.sourceforge.net
Sun Sep 27 16:59:41 CEST 2009


Revision: 44401
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44401&view=rev
Author:   dhewg
Date:     2009-09-27 14:59:40 +0000 (Sun, 27 Sep 2009)

Log Message:
-----------
New configure var "_port_mk", set to "ports.mk" per default. Ports can overwrite this, and this change finally allows make targets in that file to access all the common mk variables (e.g. EXECUTABLE).

Modified Paths:
--------------
    scummvm/trunk/Makefile
    scummvm/trunk/configure

Modified: scummvm/trunk/Makefile
===================================================================
--- scummvm/trunk/Makefile	2009-09-27 14:18:21 UTC (rev 44400)
+++ scummvm/trunk/Makefile	2009-09-27 14:59:40 UTC (rev 44401)
@@ -78,4 +78,7 @@
 	$(error You need to run $(srcdir)/configure before you can run make. Check $(srcdir)/configure --help for a list of parameters)
 endif
 
-include $(srcdir)/ports.mk
+ifneq ($(origin port_mk), undefined)
+include $(srcdir)/$(port_mk)
+endif
+

Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure	2009-09-27 14:18:21 UTC (rev 44400)
+++ scummvm/trunk/configure	2009-09-27 14:59:40 UTC (rev 44401)
@@ -165,6 +165,7 @@
 _host_alias=""
 
 _srcdir=`dirname $0`
+_port_mk="ports.mk"
 
 # Determine a tmp file name, using mktemp(1) when available.
 if type mktemp > /dev/null 2>&1 ; then
@@ -2458,6 +2459,8 @@
 
 $_mak_plugins
 
+port_mk = $_port_mk
+
 SAVED_CONFIGFLAGS  := $SAVED_CONFIGFLAGS
 SAVED_LDFLAGS      := $SAVED_LDFLAGS
 SAVED_CXX          := $SAVED_CXX


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




More information about the Scummvm-git-logs mailing list