diff options
| author |  glondu <glondu@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2008-09-06 03:42:42 +0000 |
|---|---|---|
| committer | glondu <glondu@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2008-09-06 03:42:42 +0000 |
| commit | 6ccc690a6e3e1754392683afd8e4086c49441942 (patch) | |
| tree | c6bf498904dcd1f3d497a993d11af6695e78086b /Makefile.common | |
| parent | a353947b5c7645ccc6576bad0124ef6cca358001 (diff) | |
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
Diffstat (limited to 'Makefile.common')
| -rw-r--r-- | Makefile.common | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.common b/Makefile.common index 5c8c28cd3..af3ed88fe 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 |