You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by be...@apache.org on 2014/01/09 16:27:17 UTC

[2/4] git commit: updated refs/heads/1994-merge-rcouch to 78c1a3f

fix makefile


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/200d770e
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/200d770e
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/200d770e

Branch: refs/heads/1994-merge-rcouch
Commit: 200d770e5b75514a4d5498b9744132fc5fe06d49
Parents: 439f54c
Author: Benoit Chesneau <be...@apache.org>
Authored: Thu Jan 9 08:41:49 2014 +0100
Committer: Benoit Chesneau <be...@apache.org>
Committed: Thu Jan 9 08:41:49 2014 +0100

----------------------------------------------------------------------
 Makefile | 35 +++++++++++++++--------------------
 1 file changed, 15 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/200d770e/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 2bfc2ac..e18a83d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,14 @@
 BASE_DIR = $(shell pwd)
-ERLANG_BIN = $(shell dirname $(shell which erl))
-ESCRIPT = $(shell which escript)
-GIT_BIN = $(shell dirname $(shell which git))
+ERLC ?= $(shell which erl)
+ESCRIPT ?= $(shell which escript)
 REBAR ?= $(BASE_DIR)/rebar
 OVERLAY_VARS ?=
 
-$(if $(ERLANG_BIN),,$(warning "Warning: No Erlang found in your path, this will probably not work"))
+$(if $(ERLC),,$(warning "Warning: No Erlang found in your path, this will probably not work"))
 
 $(if $(ESCRIPT),,$(warning "Warning: No escript found in your path, this will probably not work"))
 
-$(if $(GIT_BIN),,$(warning "Warning: No Git found in your path, this will probably not work"))
-
-
-.PHONY: rel deps
+.PHONY: rel deps rebar
 
 COUCHDB_STATIC=1
 ifeq ($(libs), shared)
@@ -26,23 +22,23 @@ ifeq ($(icu), static)
 endif
 export USE_STATIC_ICU
 
-all: rebar deps compile
+all: deps compile
 
 compile:
-	@./rebar compile
+	@$(REBAR) compile
 
-deps:
-	@./rebar get-deps
+deps: rebar
+	@$(REBAR) get-deps
 
-clean: rebarclean
-	@./rebar clean
+clean:
+	@$(REBAR) clean
 
-distclean: clean relclean
+distclean: clean rebarclean relclean
 
 generate:
-	@./rebar generate $(OVERLAY_VARS)
+	@$(REBAR) generate $(OVERLAY_VARS)
 
-rel: deps compile generate
+rel: generate
 
 relclean:
 	@rm -rf rel/apache-couchdb
@@ -51,9 +47,8 @@ rebar:
 	@(test ! -e $(BASE_DIR)/src/support/rebar/rebar && \
 		echo "==> build rebar" && \
 		cd $(BASE_DIR)/src/support/rebar && \
-		$(ESCRIPT) bootstrap)
-
-	cp $(BASE_DIR)/src/support/rebar/rebar $(BASE_DIR)/rebar
+		$(ESCRIPT) bootstrap || true)
+	@cp $(BASE_DIR)/src/support/rebar/rebar $(BASE_DIR)/rebar
 
 rebarclean:
 	@(cd $(BASE_DIR)/support/rebar/rebar && \