diff options
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/JunitTest.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/source_and_rerun.mk | 12 | ||||
| -rw-r--r-- | solenv/gbuild/templates/Makefile | 5 |
3 files changed, 11 insertions, 8 deletions
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk index e9065f1f8014..3003c9dbd701 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/solenv/gbuild/JunitTest.mk @@ -62,7 +62,7 @@ $(call gb_JunitTest_get_target,%) : && echo "see full error log at $@.log" \ && echo "to rerun just this failed test without all others, run either:" \ && echo "cd \$$MODULE && make $@" \ - && echo "make -f ${SRCDIR}/GNUmakefile.mk $@" && false)) && \ + && echo "make -f $(SRCDIR)/GNUmakefile.mk $@" && false)) && \ rm -rf $(call gb_JunitTest_get_userdir,$*)) $(CLEAN_CMD) diff --git a/solenv/gbuild/source_and_rerun.mk b/solenv/gbuild/source_and_rerun.mk index 0de1a9ddf35f..418acc593c17 100644 --- a/solenv/gbuild/source_and_rerun.mk +++ b/solenv/gbuild/source_and_rerun.mk @@ -1,11 +1,13 @@ -dummy: - @if test -f ./config.mk; then . ./config.mk; else if test -f ../config.mk ; then . ../config.mk; fi; fi && \ - if test -f ./Env.Host.sh; then . ./Env.Host.sh; else if test -f ../Env.Host.sh; then . ../Env.Host.sh; fi ; fi && \ +gb_MAKEFILEDIR:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) + +source-env-and-recurse: + @if test -f $(gb_MAKEFILEDIR)/config.mk; then . $(gb_MAKEFILEDIR)/config.mk; else if test -f $(gb_MAKEFILEDIR)/../config.mk ; then . $(gb_MAKEFILEDIR)/../config.mk; fi; fi && \ + if test -f $(gb_MAKEFILEDIR)/Env.Host.sh; then . $(gb_MAKEFILEDIR)/Env.Host.sh; else if test -f $(gb_MAKEFILEDIR)/../Env.Host.sh; then . $(gb_MAKEFILEDIR)/../Env.Host.sh; fi ; fi && \ if test -z "$${SOLARENV}"; then echo "No environment set!" 2>&1; exit 1; fi && \ - $(MAKE) $(MAKECMDGOALS) + $(MAKE) -f $(firstword $(MAKEFILE_LIST)) $(MAKECMDGOALS) ifneq ($(strip $(MAKECMDGOALS)),) -$(eval $(MAKECMDGOALS) : dummy) +$(eval $(MAKECMDGOALS) : source-env-and-recurse) endif diff --git a/solenv/gbuild/templates/Makefile b/solenv/gbuild/templates/Makefile index 78def2598caa..f9ac01ef0747 100644 --- a/solenv/gbuild/templates/Makefile +++ b/solenv/gbuild/templates/Makefile @@ -1,8 +1,9 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2000, 2011 Oracle and/or its affiliates. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -26,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T |