mirror of
https://github.com/gnustep/tools-make.git
synced 2025-05-06 03:40:44 +00:00
Fixed check if this is the top-level make invocation or not to work
properly when we're invoked inside a non-gnustep-make make git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@21879 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
15771e8a7b
commit
3d8cf6ecc4
1 changed files with 21 additions and 7 deletions
|
@ -60,23 +60,37 @@ endif
|
||||||
# internal-check-installation-permissions comes before everything so
|
# internal-check-installation-permissions comes before everything so
|
||||||
# that we run any command if we aren't allowed to install
|
# that we run any command if we aren't allowed to install
|
||||||
# install depends on all as per GNU/Unix habits, conventions and standards.
|
# install depends on all as per GNU/Unix habits, conventions and standards.
|
||||||
ifeq ($(MAKELEVEL),0)
|
|
||||||
|
# The very first top-most make invocation we want to have install
|
||||||
|
# depend on internal-check-install-permissions and on all, and
|
||||||
|
# distclean depend on clean. We used to check MAKELEVEL=0 here to
|
||||||
|
# determine if this is the top-most invocation of make, but that does
|
||||||
|
# not work if the top-most invocation of make is done from within a
|
||||||
|
# (non-gnustep-make) makefile itself! So we use a marker variable.
|
||||||
|
# _GNUSTEP_TOP_INVOCATION_DONE is not set the very first / top-most
|
||||||
|
# make invocation , but we set it for all sub-invocations, so all
|
||||||
|
# subinvocations will have it set and we can distinguish them.
|
||||||
|
ifeq ($(_GNUSTEP_TOP_INVOCATION_DONE),)
|
||||||
|
# Top-most invocation of make
|
||||||
install:: internal-check-install-permissions all \
|
install:: internal-check-install-permissions all \
|
||||||
before-install internal-install after-install internal-after-install
|
before-install internal-install after-install internal-after-install
|
||||||
|
|
||||||
|
distclean:: clean before-distclean internal-distclean after-distclean
|
||||||
|
|
||||||
|
# Further make invocations will have this variable set
|
||||||
|
export _GNUSTEP_TOP_INVOCATION_DONE = 1
|
||||||
else
|
else
|
||||||
|
# Sub-invocation of make
|
||||||
install:: before-install internal-install after-install internal-after-install
|
install:: before-install internal-install after-install internal-after-install
|
||||||
|
|
||||||
|
distclean:: before-distclean internal-distclean after-distclean
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
||||||
uninstall:: before-uninstall internal-uninstall after-uninstall
|
uninstall:: before-uninstall internal-uninstall after-uninstall
|
||||||
|
|
||||||
clean:: before-clean internal-clean after-clean
|
clean:: before-clean internal-clean after-clean
|
||||||
|
|
||||||
ifeq ($(MAKELEVEL),0)
|
|
||||||
distclean:: clean before-distclean internal-distclean after-distclean
|
|
||||||
else
|
|
||||||
distclean:: before-distclean internal-distclean after-distclean
|
|
||||||
endif
|
|
||||||
|
|
||||||
check:: before-check internal-check after-check
|
check:: before-check internal-check after-check
|
||||||
|
|
||||||
strings:: before-strings internal-strings after-strings
|
strings:: before-strings internal-strings after-strings
|
||||||
|
|
Loading…
Reference in a new issue