aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJason L. Shiffer <[email protected]>2015-08-18 12:49:51 -0400
committerJason L. Shiffer <[email protected]>2015-08-18 12:49:51 -0400
commit35a03f2bdc07651c9dc28fb2a3bfce43d4f7fdc5 (patch)
tree7e493cc7c90e4392d790fd8ad586243fcd36779a /core
parentccd2b9f3ddf51ce6b7011263265b214c05ac63a3 (diff)
downloaderlang.mk-35a03f2bdc07651c9dc28fb2a3bfce43d4f7fdc5.tar.gz
erlang.mk-35a03f2bdc07651c9dc28fb2a3bfce43d4f7fdc5.tar.bz2
erlang.mk-35a03f2bdc07651c9dc28fb2a3bfce43d4f7fdc5.zip
Fix build config renaming
Currently build.config can be placed in a different directory via something like: ERLANG_MK_BUILD_CONFIG = tools/build.config but if the name is changed: ERLANG_MK_BUILD_CONFIG = .erlang-mk.config it will be ignored.
Diffstat (limited to 'core')
-rw-r--r--core/core.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/core.mk b/core/core.mk
index d0e8ed1..a6f55b6 100644
--- a/core/core.mk
+++ b/core/core.mk
@@ -180,7 +180,7 @@ ERLANG_MK_BUILD_DIR ?= .erlang.mk.build
erlang-mk:
git clone https://github.com/ninenines/erlang.mk $(ERLANG_MK_BUILD_DIR)
- if [ -f $(ERLANG_MK_BUILD_CONFIG) ]; then cp $(ERLANG_MK_BUILD_CONFIG) $(ERLANG_MK_BUILD_DIR); fi
+ if [ -f $(ERLANG_MK_BUILD_CONFIG) ]; then cp $(ERLANG_MK_BUILD_CONFIG) $(ERLANG_MK_BUILD_DIR)/build.config; fi
cd $(ERLANG_MK_BUILD_DIR) && $(MAKE)
cp $(ERLANG_MK_BUILD_DIR)/erlang.mk ./erlang.mk
rm -rf $(ERLANG_MK_BUILD_DIR)