aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrik Nyblom <[email protected]>2011-03-31 11:46:10 +0200
committerPatrik Nyblom <[email protected]>2011-03-31 11:46:10 +0200
commit92bbb54ca1cd56f86284ad0a99df2a820a4e4461 (patch)
tree05b119b36cb2afe89f3d81b393eada04dfb7e316
parent10d4235c7ab92f898d7411d3717f1d03db8c46c3 (diff)
downloadotp-92bbb54ca1cd56f86284ad0a99df2a820a4e4461.tar.gz
otp-92bbb54ca1cd56f86284ad0a99df2a820a4e4461.tar.bz2
otp-92bbb54ca1cd56f86284ad0a99df2a820a4e4461.zip
Teach toplevel makefile to always use newly built escript.
-rw-r--r--Makefile.in19
1 files changed, 12 insertions, 7 deletions
diff --git a/Makefile.in b/Makefile.in
index 3d1a776126..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)/bin/escript $(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