diff --git a/README b/README index 1047f26..cab5b42 100644 --- a/README +++ b/README @@ -34,28 +34,27 @@ information. *=*=*=*=*=*=*=*=*=*=*=*=*=*=*= - Building `headache` requires Objective Caml (version 3.06 or up, -available at http://caml.inria.fr/) and GNU Make. In addition, from -version 1.03-utf8, the build requires the Unicode library Camomile and, -from version 1.04, Dune. + Building `headache` requires Objective Caml (available at +http://caml.inria.fr/) and GNU Make. In addition, from version +1.03-utf8, the build requires the Unicode library Camomile and, from +version 1.04, Dune. Instructions -<< - make && sudo make INSTALLDIR=/usr/local/bin install ->> - Build the executable and install it into the specified directory. `headache` is available through OPAM (available at http://opam.ocaml.org/), the OCaml Package Manager. This is the -preferred installation method. Be sure to install opam v1.2 or higher. -Then the following sequence of commands should install the package: +preferred installation method. Then the following sequence of commands +should install the package: << opam init - opam install depext - opam depext headache opam install headache >> + Alternatively, you can use these commands (Dune must be installed): +<< + make && sudo make INSTALLDIR=/usr/local/bin install +>> + Build the executable and install it into the specified directory. 3 Usage diff --git a/doc-src/manual.tex b/doc-src/manual.tex index 2461519..b6360b1 100644 --- a/doc-src/manual.tex +++ b/doc-src/manual.tex @@ -73,29 +73,28 @@ \section{Overview} % ************************************************************************* \section{Compilation and installation} -Building \headache{} requires \emph{Objective Caml} (version 3.06 or up, -available at \url{http://caml.inria.fr/}) and \emph{GNU Make}. +Building \headache{} requires \emph{Objective Caml} (available at +\url{http://caml.inria.fr/}) and \emph{GNU Make}. In addition, from version \texttt{1.03-utf8}, the build requires the Unicode library \emph{Camomile} and, from version \texttt{1.04}, \emph{Dune}. \paragraph{Instructions} -\begin{alltt} - make && sudo make INSTALLDIR=/usr/local/bin install -\end{alltt} -Build the executable and install it into the specified directory. - \headache{} is available through \emph{OPAM} (available at \url{http://opam.ocaml.org/}), the \emph{OCaml Package Manager}. This is the preferred installation method. -Be sure to install opam v1.2 or higher. Then the following sequence of commands should install the package: \begin{alltt} opam init - opam install depext - opam depext headache opam install headache \end{alltt} +Alternatively, you can use these commands (\emph{Dune} must be installed): + +\begin{alltt} + make && sudo make INSTALLDIR=/usr/local/bin install +\end{alltt} +Build the executable and install it into the specified directory. + % ************************************************************************* \section{Usage} diff --git a/doc/manual.html b/doc/manual.html index 28a3c9d..05d4480 100644 --- a/doc/manual.html +++ b/doc/manual.html @@ -2,7 +2,7 @@ - +