diff options
| author |  glondu <glondu@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2008-07-28 12:53:25 +0000 |
|---|---|---|
| committer | glondu <glondu@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2008-07-28 12:53:25 +0000 |
| commit | 26b8d44290aeee4b11a48ee07a3e7ce6c105e3c2 (patch) | |
| tree | 063cc6686b9fea6541160a787c1f98fbbada07b0 | |
| parent | 334df9c148cdefa9cc508ea0a1230d8e9606ee30 (diff) | |
Use COQINSTALLPREFIX for doc too
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@11286 85f007b7-540e-0410-9357-904b9bb8a0f7
| -rw-r--r-- | Makefile.build | 1 | ||||
| -rw-r--r-- | Makefile.doc | 34 |
2 files changed, 18 insertions, 17 deletions
diff --git a/Makefile.build b/Makefile.build index 1d9b74feb..206c62c7b 100644 --- a/Makefile.build +++ b/Makefile.build @@ -629,6 +629,7 @@ FULLCOQLIB=$(COQLIB:"$(OLDROOT)%="$(COQINSTALLPREFIX)%) FULLMANDIR=$(MANDIR:"$(OLDROOT)%="$(COQINSTALLPREFIX)%) FULLEMACSLIB=$(EMACSLIB:"$(OLDROOT)%="$(COQINSTALLPREFIX)%) FULLCOQDOCDIR=$(COQDOCDIR:"$(OLDROOT)%="$(COQINSTALLPREFIX)%) +FULLDOCDIR=$(DOCDIR:"$(OLDROOT)%="$(COQINSTALLPREFIX)%) install-coq: install-binaries install-library install-coq-info install-coqlight: install-binaries install-library-light diff --git a/Makefile.doc b/Makefile.doc index 241ba8bc4..fd76d9132 100644 --- a/Makefile.doc +++ b/Makefile.doc @@ -221,26 +221,26 @@ ide/index_urls.txt: doc/refman/html/index.html install-doc: install-doc-meta install-doc-html install-doc-printable install-doc-meta: - $(MKDIR) $(DOCDIR) - $(INSTALLLIB) doc/LICENCE $(DOCDIR)/LICENCE.doc + $(MKDIR) $(FULLDOCDIC) + $(INSTALLLIB) doc/LICENCE $(FULLDOCDIR)/LICENCE.doc install-doc-html: doc-html - $(MKDIR) $(addprefix $(DOCDIR)/html/, refman stdlib faq) - $(INSTALLLIB) doc/refman/html/* $(DOCDIR)/html/refman - $(INSTALLLIB) doc/stdlib/html/* $(DOCDIR)/html/stdlib - $(INSTALLLIB) doc/RecTutorial/RecTutorial.v.html $(DOCDIR)/html/RecTutorial.html - $(INSTALLLIB) doc/faq/html/* $(DOCDIR)/html/faq - $(INSTALLLIB) doc/tutorial/Tutorial.v.html $(DOCDIR)/html/Tutorial.html + $(MKDIR) $(addprefix $(FULLDOCDIC)/html/, refman stdlib faq) + $(INSTALLLIB) doc/refman/html/* $(FULLDOCDIC)/html/refman + $(INSTALLLIB) doc/stdlib/html/* $(FULLDOCDIC)/html/stdlib + $(INSTALLLIB) doc/RecTutorial/RecTutorial.v.html $(FULLDOCDIC)/html/RecTutorial.html + $(INSTALLLIB) doc/faq/html/* $(FULLDOCDIC)/html/faq + $(INSTALLLIB) doc/tutorial/Tutorial.v.html $(FULLDOCDIC)/html/Tutorial.html install-doc-printable: doc-pdf doc-ps - $(MKDIR) $(DOCDIR)/ps $(DOCDIR)/pdf + $(MKDIR) $(FULLDOCDIC)/ps $(FULLDOCDIC)/pdf $(INSTALLLIB) doc/refman/Reference-Manual.pdf \ - doc/stdlib/Library.pdf $(DOCDIR)/pdf + doc/stdlib/Library.pdf $(FULLDOCDIC)/pdf $(INSTALLLIB) doc/refman/Reference-Manual.ps \ - doc/stdlib/Library.ps $(DOCDIR)/ps - $(INSTALLLIB) doc/tutorial/Tutorial.v.pdf $(DOCDIR)/pdf/Tutorial.pdf - $(INSTALLLIB) doc/RecTutorial/RecTutorial.v.pdf $(DOCDIR)/pdf/RecTutorial.pdf - $(INSTALLLIB) doc/faq/FAQ.v.pdf $(DOCDIR)/pdf/FAQ.pdf - $(INSTALLLIB) doc/tutorial/Tutorial.v.ps $(DOCDIR)/ps/Tutorial.ps - $(INSTALLLIB) doc/RecTutorial/RecTutorial.v.ps $(DOCDIR)/ps/RecTutorial.ps - $(INSTALLLIB) doc/faq/FAQ.v.ps $(DOCDIR)/ps/FAQ.ps + doc/stdlib/Library.ps $(FULLDOCDIC)/ps + $(INSTALLLIB) doc/tutorial/Tutorial.v.pdf $(FULLDOCDIC)/pdf/Tutorial.pdf + $(INSTALLLIB) doc/RecTutorial/RecTutorial.v.pdf $(FULLDOCDIC)/pdf/RecTutorial.pdf + $(INSTALLLIB) doc/faq/FAQ.v.pdf $(FULLDOCDIC)/pdf/FAQ.pdf + $(INSTALLLIB) doc/tutorial/Tutorial.v.ps $(FULLDOCDIC)/ps/Tutorial.ps + $(INSTALLLIB) doc/RecTutorial/RecTutorial.v.ps $(FULLDOCDIC)/ps/RecTutorial.ps + $(INSTALLLIB) doc/faq/FAQ.v.ps $(FULLDOCDIC)/ps/FAQ.ps |