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).

svn-id: r44401

2 files changed, 7 insertions, 1 deletions

diff --git a/Makefile b/Makefile
index 59624891e6..7b974d08ba 100644
--- a/Makefile
+++ b/Makefile
@@ -78,4 +78,7 @@ else
 	$(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
+
diff --git a/configure b/configure
index 56eaafe41f..f842b75f1e 100755
--- a/configure
+++ b/configure
@@ -165,6 +165,7 @@ _host_os=""
 _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 @@ LDFLAGS += $LDFLAGS
 
 $_mak_plugins
 
+port_mk = $_port_mk
+
 SAVED_CONFIGFLAGS  := $SAVED_CONFIGFLAGS
 SAVED_LDFLAGS      := $SAVED_LDFLAGS
 SAVED_CXX          := $SAVED_CXX