diff options
| author | Patrik Nyblom <[email protected]> | 2011-05-11 17:10:37 +0200 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2011-05-11 17:10:37 +0200 |
| commit | 550b27993d040a412032703e69341cd9d7dc846c (patch) | |
| tree | 203253a1af72690f09896fa54a43f1ece4687468 | |
| parent | 1bae2eb502808757a7877b86f2d8eb74b8092a09 (diff) | |
| parent | 92bbb54ca1cd56f86284ad0a99df2a820a4e4461 (diff) | |
| download | otp-550b27993d040a412032703e69341cd9d7dc846c.tar.gz otp-550b27993d040a412032703e69341cd9d7dc846c.tar.bz2 otp-550b27993d040a412032703e69341cd9d7dc846c.zip | |
Merge branch 'pan/release_docs-use-newly-built-escript/OTP-9176' into dev
* pan/release_docs-use-newly-built-escript/OTP-9176:
Teach toplevel makefile to always use newly built escript.
Fix for Makefile.in invoking xref_mod_app.escript
| -rw-r--r-- | Makefile.in | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/Makefile.in b/Makefile.in index ca92bf604d..b17713f182 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,7 +1,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 1998-2010. All Rights Reserved. +# Copyright Ericsson AB 1998-2011. All Rights Reserved. # # The contents of this file are subject to the Erlang Public License, # Version 1.1, (the "License"); you may not use this file except in @@ -396,20 +396,25 @@ endif release_docs docs: mod2app ifeq ($(OTP_SMALL_BUILD),true) cd $(ERL_TOP)/lib && \ - ERL_TOP=$(ERL_TOP) $(MAKE) TESTROOT=$(RELEASE_ROOT) $@ + PATH=$(ERL_TOP)/bin:$${PATH} ERL_TOP=$(ERL_TOP) \ + $(MAKE) TESTROOT=$(RELEASE_ROOT) $@ else cd $(ERL_TOP)/lib && \ - ERL_TOP=$(ERL_TOP) $(MAKE) BUILD_ALL=1 TESTROOT=$(RELEASE_ROOT) $@ + PATH=$(ERL_TOP)/bin:$${PATH} ERL_TOP=$(ERL_TOP) \ + $(MAKE) BUILD_ALL=1 TESTROOT=$(RELEASE_ROOT) $@ cd $(ERL_TOP)/lib/dialyzer && \ - ERL_TOP=$(ERL_TOP) $(MAKE) BUILD_ALL=1 TESTROOT=$(RELEASE_ROOT) $@ + PATH=$(ERL_TOP)/bin:$${PATH} ERL_TOP=$(ERL_TOP) \ + $(MAKE) BUILD_ALL=1 TESTROOT=$(RELEASE_ROOT) $@ endif cd $(ERL_TOP)/erts && \ - ERL_TOP=$(ERL_TOP) $(MAKE) BUILD_ALL=1 TESTROOT=$(RELEASE_ROOT) $@ + PATH=$(ERL_TOP)/bin:$${PATH} ERL_TOP=$(ERL_TOP) \ + $(MAKE) BUILD_ALL=1 TESTROOT=$(RELEASE_ROOT) $@ cd $(ERL_TOP)/system/doc && \ + PATH=$(ERL_TOP)/bin:$${PATH} \ ERL_TOP=$(ERL_TOP) $(MAKE) TESTROOT=$(RELEASE_ROOT) $@ -mod2app: - $(ERL_TOP)/lib/erl_docgen/priv/bin/xref_mod_app.escript -topdir $(ERL_TOP) -outfile $(ERL_TOP)/make/$(TARGET)/mod2app.xml +mod2app: + PATH=$(ERL_TOP)/bin:$${PATH} escript $(ERL_TOP)/lib/erl_docgen/priv/bin/xref_mod_app.escript -topdir $(ERL_TOP) -outfile $(ERL_TOP)/make/$(TARGET)/mod2app.xml # ---------------------------------------------------------------------- ERLANG_EARS=$(BOOTSTRAP_ROOT)/bootstrap/erts |