diff options
| -rw-r--r-- | Makefile | 12 | ||||
| -rw-r--r-- | config/Makefile.template | 7 | ||||
| -rwxr-xr-x | configure | 38 |
3 files changed, 26 insertions, 31 deletions
@@ -1152,6 +1152,7 @@ FULLBINDIR=$(COQINSTALLPREFIX)$(BINDIR) FULLCOQLIB=$(COQINSTALLPREFIX)$(COQLIB) FULLMANDIR=$(COQINSTALLPREFIX)$(MANDIR) FULLEMACSLIB=$(COQINSTALLPREFIX)$(EMACSLIB) +FULLCOQDOCDIR=$(COQINSTALLPREFIX)$(COQDOCDIR) install-coq: install-binaries install-library install-coq-info install-coq8: install-binaries install-library8 install-coq-info @@ -1232,16 +1233,13 @@ install-emacs: $(MKDIR) $(FULLEMACSLIB) cp tools/coq.el tools/coq-inferior.el $(FULLEMACSLIB) -# where to put the coqdoc style file -TEXDIR = $(BASETEXDIR)/tex/latex/misc - # command to update TeX' kpathsea database -UPDATETEX = $(MKTEXLSR) /usr/share/texmf /var/spool/texmf $(BASETEXDIR) > /dev/null +#UPDATETEX = $(MKTEXLSR) /usr/share/texmf /var/spool/texmf $(BASETEXDIR) > /dev/null install-latex: - $(MKDIR) $(TEXDIR) - cp tools/coqdoc/coqdoc.sty $(TEXDIR) - -$(UPDATETEX) + $(MKDIR) $(FULLCOQDOCDIR) + cp tools/coqdoc/coqdoc.sty $(FULLCOQDOCDIR) +# -$(UPDATETEX) ########################################################################### # Documentation diff --git a/config/Makefile.template b/config/Makefile.template index d3f853f17..3970fd738 100644 --- a/config/Makefile.template +++ b/config/Makefile.template @@ -79,17 +79,14 @@ OSDEPLIBS=OSDEPENDENTLIBS # Win32 systems : .exe EXE=EXECUTEEXTENSION -# the command used to install binaries, libs and help files -INSTALL=COQTOPDIRECTORY/bin/ARCHITECTURE/coqinstallEXECUTEEXTENSION - # the command MKDIR (try to replace it with mkdirhier if you have problems) MKDIR=mkdir -p # where to put the coqdoc.sty style file -BASETEXDIR=TEXDIRECTORY +COQDOCDIR=COQDOCDIRECTORY # command to update TeX' kpathsea database -MKTEXLSR=MKTEXLSRCOMMAND +#MKTEXLSR=MKTEXLSRCOMMAND #the command STRIP # Unix systems and profiling: true @@ -36,7 +36,7 @@ libdir_spec=no mandir_spec=no emacslib_spec=no emacs_spec=no -texdir_spec=no +coqdocdir_spec=no reals_opt=no reals=all arch_spec=no @@ -56,8 +56,8 @@ while : ; do libdir=$2/lib/coq mandir_spec=yes mandir=$2/man - texdir_spec=yes - texdir=$2/share/texmf + coqdocdir_spec=yes + coqdocdir=$2/share/texmf/tex/latex/misc shift;; -local|--local) local=true bindir_spec=yes @@ -68,8 +68,8 @@ while : ; do mandir=$COQTOP/man emacslib_spec=yes emacslib=$COQTOP/tools/emacs - texdir_spec=yes - texdir=$COQTOP/share/texmf + coqdocdir_spec=yes + coqdocdir=$COQTOP/tools/coqdoc reals_opt=yes reals=all;; -src|--src) COQTOP=$2 @@ -89,8 +89,8 @@ while : ; do -emacs |--emacs) emacs_spec=yes emacs=$2 shift;; - -texdir|--texdir) texdir_spec=yes - texdir=$2 + -coqdocdir|--coqdocdir) coqdocdir_spec=yes + coqdocdir=$2 shift;; -arch|--arch) arch_spec=yes arch=$2 @@ -160,7 +160,7 @@ case $ARCH in libdir_def=/usr/local/lib/coq mandir_def=/usr/local/man emacslib_def=/usr/share/emacs/site-lisp - texdir_def=/usr/share/texmf;; + coqdocdir_def=/usr/share/texmf/tex/latex/misc;; esac emacs_def=emacs @@ -209,15 +209,15 @@ case $emacslib_spec in yes) EMACSLIB=$emacslib;; esac -case $texdir_spec in - no) echo "Where should I install TeX/LaTeX files [$texdir_def] ?" - read TEXDIR +case $coqdocdir_spec in + no) echo "Where should I install Coqdoc TeX/LaTeX files [$coqdocdir_def] ?" + read COQDOCDIR - case $TEXDIR in - "") TEXDIR=$texdir_def;; + case $COQDOCDIR in + "") COQDOCDIR=$coqdocdir_def;; *) true;; esac;; - yes) TEXDIR=$texdir;; + yes) COQDOCDIR=$coqdocdir;; esac case $reals_opt in @@ -378,10 +378,10 @@ case $ARCH in esac # mktexlsr -MKTEXLSR=`which mktexlsr` -case $MKTEXLSR in - "") MKTEXLSR=true;; -esac +#MKTEXLSR=`which mktexlsr` +#case $MKTEXLSR in +# "") MKTEXLSR=true;; +#esac # Summary of the configuration @@ -491,7 +491,7 @@ sed -e "s|LOCALINSTALLATION|$local|" \ -e "s|MANDIRDIRECTORY|$MANDIR|" \ -e "s|EMACSLIBDIRECTORY|$EMACSLIB|" \ -e "s|EMACSCOMMAND|$EMACS|" \ - -e "s|TEXDIRECTORY|$TEXDIR|" \ + -e "s|COQDOCDIRECTORY|$COQDOCDIR|" \ -e "s|MKTEXLSRCOMMAND|$MKTEXLSR|" \ -e "s|ARCHITECTURE|$ARCH|" \ -e "s|OSDEPENDENTLIBS|$OSDEPLIBS|" \ |