From b9312acc45407a58d07e19e407e9575d427dd6c3 Mon Sep 17 00:00:00 2001
From: Jason Gross <jasongross9@gmail.com>
Date: Mon, 25 Jul 2016 13:03:18 -0700
Subject: If COQPATH is not set, set it by default (#38)

This allows most users to not need to type COQPATH=... on make.
---
 Makefile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 3be8c6754..0deb7bd28 100644
--- a/Makefile
+++ b/Makefile
@@ -63,6 +63,9 @@ OTHERFLAGS ?= -w "-deprecated-appcontext -notation-overridden"
 endif
 endif
 
+COQPATH?=$(shell pwd)/$(COQPRIME_FOLDER)
+export COQPATH
+
 coqprime:
 	$(MAKE) -C $(COQPRIME_FOLDER)
 
@@ -74,7 +77,7 @@ install-coqprime:
 
 Makefile.coq: Makefile _CoqProject
 	$(SHOW)'COQ_MAKEFILE -f _CoqProject > $@'
-	$(HIDE)$(COQBIN)coq_makefile -f _CoqProject | sed s'|^\(-include.*\)$$|ifneq ($$(filter-out $(FAST_TARGETS),$$(MAKECMDGOALS)),)~\1~else~ifeq ($$(MAKECMDGOALS),)~\1~endif~endif|g' | tr '~' '\n' | sed s'/^clean:$$/clean::/g' | sed s'/^Makefile: /Makefile-old: /g' > $@
+	$(HIDE)$(COQBIN)coq_makefile -f _CoqProject | sed s'|^\(-include.*\)$$|ifneq ($$(filter-out $(FAST_TARGETS),$$(MAKECMDGOALS)),)~\1~else~ifeq ($$(MAKECMDGOALS),)~\1~endif~endif|g' | tr '~' '\n' | sed s'/^clean:$$/clean::/g' | sed s'/^Makefile: /Makefile-old: /g' | sed s'/^printenv:$$/printenv::/g' > $@
 
 clean::
 	rm -f Makefile.coq
@@ -84,5 +87,8 @@ cleanall:: clean clean-coqprime
 
 install: coq install-coqprime
 
+printenv::
+	@echo "COQPATH =        $$COQPATH"
+
 .dir-locals.el::
 	sed 's:@COQPRIME@:$(COQPRIME_FOLDER):g' .dir-locals.el.in > $@
-- 
cgit v1.2.3