From 6ccc690a6e3e1754392683afd8e4086c49441942 Mon Sep 17 00:00:00 2001
From: glondu
Date: Sat, 6 Sep 2008 03:42:42 +0000
Subject: Use $(COQTOPEXE) to refer to bin/coqtop in Makefiles

The environment variable COQTOP has a different meaning for Coq
executables and for Coq Makefiles, which is troublesome when make
forwards it to subprocesses via the environment.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@11366 85f007b7-540e-0410-9357-904b9bb8a0f7
---
 Makefile                 | 2 +-
 Makefile.build           | 2 +-
 Makefile.common          | 8 ++++----
 dev/doc/build-system.txt | 5 ++---
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index ac671c9be5..cae8d2ecdb 100644
--- a/Makefile
+++ b/Makefile
@@ -176,7 +176,7 @@ docclean:
 
 archclean: clean-ide cleantheories
 	rm -f $(COQTOPOPT) $(BESTCOQTOP) $(COQC) $(COQMKTOP)
-	rm -f $(COQTOP)  $(COQCOPT) $(COQMKTOPOPT)
+	rm -f $(COQTOPEXE)  $(COQCOPT) $(COQMKTOPOPT)
 	rm -f bin/coq-parser.opt$(EXE) bin/coq-interface.opt$(EXE)
 	find . -name '*.cmx' -or -name '*.cmxa' -or -name '*.[soa]' | xargs rm -f
 	rm -f $(TOOLS)
diff --git a/Makefile.build b/Makefile.build
index 3a5cfd36a6..eb5d46e376 100644
--- a/Makefile.build
+++ b/Makefile.build
@@ -181,7 +181,7 @@ $(COQTOPBYTE): $(COQMKTOP) $(LINKCMO) $(LIBCOQRUN)
 	$(SHOW)'COQMKTOP -o $@'	
 	$(HIDE)$(COQMKTOP) -top $(BYTEFLAGS) -o $@
 
-$(COQTOP): $(ORDER_ONLY_SEP) $(BESTCOQTOP)
+$(COQTOPEXE): $(ORDER_ONLY_SEP) $(BESTCOQTOP)
 	cd bin; ln -sf coqtop.$(BEST)$(EXE) coqtop$(EXE)
 
 LOCALCHKLIBS:=-I checker -I lib -I config -I kernel
diff --git a/Makefile.common b/Makefile.common
index 5c8c28cd31..af3ed88fef 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -23,7 +23,7 @@ COQC:=bin/coqc$(EXE)
 COQTOPBYTE:=bin/coqtop.byte$(EXE)
 COQTOPOPT:=bin/coqtop.opt$(EXE)
 BESTCOQTOP:=bin/coqtop.$(BEST)$(EXE)
-COQTOP:=bin/coqtop$(EXE)
+COQTOPEXE:=bin/coqtop$(EXE)
 CHICKENBYTE:=bin/coqchk.byte$(EXE)
 CHICKENOPT:=bin/coqchk.opt$(EXE)
 BESTCHICKEN:=bin/coqchk.$(BEST)$(EXE)
@@ -39,10 +39,10 @@ COQIDE:=bin/coqide$(EXE)
 
 ifeq ($(BEST),opt)
 COQBINARIES:= $(COQMKTOP) $(COQC) \
-  $(COQTOPBYTE) $(COQTOPOPT) $(COQTOP) $(CHICKENBYTE) $(CHICKENOPT) $(CHICKEN)
+  $(COQTOPBYTE) $(COQTOPOPT) $(COQTOPEXE) $(CHICKENBYTE) $(CHICKENOPT) $(CHICKEN)
 else
 COQBINARIES:= $(COQMKTOP) $(COQC) \
-  $(COQTOPBYTE)              $(COQTOP) $(CHICKENBYTE)               $(CHICKEN)
+  $(COQTOPBYTE)              $(COQTOPEXE) $(CHICKENBYTE)               $(CHICKEN)
 endif
 OTHERBINARIES:=$(COQMKTOPBYTE) $(COQCBYTE)
 
@@ -74,7 +74,7 @@ HEVEA:=hevea
 HEVEAOPTS:=-fix -exec xxdate.exe
 HEVEALIB:=/usr/local/lib/hevea:/usr/lib/hevea
 export TEXINPUTS:=$(COQSRC)/doc:$(HEVEALIB):
-COQTEXOPTS:=-n 72 -image $(COQSRC)/$(COQTOP) -v -sl -small
+COQTEXOPTS:=-n 72 -image $(COQSRC)/$(COQTOPEXE) -v -sl -small
 
 DOCCOMMON:=doc/common/version.tex doc/common/title.tex doc/common/macros.tex 
 
diff --git a/dev/doc/build-system.txt b/dev/doc/build-system.txt
index c9571f7c94..9362aeeb37 100644
--- a/dev/doc/build-system.txt
+++ b/dev/doc/build-system.txt
@@ -253,9 +253,8 @@ config/Makefile looks like it contains a lot of unused variables,
 clean that up (are any maybe used by nightly scripts on
 pauillac?). Also, the COQTOP variable from config/Makefile (and used
 in contribs) has a very poorly chosen name, because "coqtop" is the
-name of a Coq executable! For example, in the Coq makefile it is
-immediately clobbered by "bin/coqtop$(EXE)"! Rename it to COQROOT or
-COQTREE or COQDIR or ...
+name of a Coq executable! In the coq Makefiles, $(COQTOPEXE) is used
+to refer to that executable.
 
 Promote the granular .glob handling to official way of doing things
 for Coq developments, that is implement it in coq_makefile and the
-- 
cgit v1.2.3