From 9091978e1e82e9da2fe9bb8569d24f4f5f9c0b71 Mon Sep 17 00:00:00 2001 From: Joel VanderWerf Date: Mon, 28 Jul 2014 20:41:42 -0700 Subject: [PATCH 1/2] Fix instructions for building from git source. --- doc/installation.tex | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/doc/installation.tex b/doc/installation.tex index 8db3c9f15..1220d5f0f 100644 --- a/doc/installation.tex +++ b/doc/installation.tex @@ -310,6 +310,13 @@ \section{Installing from Git} Required Dependencies: +As noted in the section above on installing from tarballs, you must have: + +libpopt-dev +libgoogle-glog-dev +libjson-c-dev +libjson0-dev + \begin{itemize} \item \href{http://www.gnu.org/software/autoconf/}{Autoconf} Used as part of the build system. Required for all builds. @@ -336,8 +343,11 @@ \section{Installing from Git} from markdown to man page format. \end{itemize} -You'll need to build po6, e, BusyBee, HyperLevelDB Replicant, and HyperDex from -Git, as the development version often introduces across repositories. +You'll need to build po6, e, BusyBee, HyperLevelDB, Replicant, and HyperDex from +Git, as the development version often introduces incompatible changes across +repositories. + +Build and install the repos in the order listed above. For each of these repositories, you may build and install the code with: From 120329a07208a85179bec798feb12d72271b3d47 Mon Sep 17 00:00:00 2001 From: Joel VanderWerf Date: Thu, 31 Jul 2014 15:33:21 -0700 Subject: [PATCH 2/2] Format and clarify instructions for installing dependencies. --- doc/installation.tex | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/doc/installation.tex b/doc/installation.tex index 1220d5f0f..1214566b7 100644 --- a/doc/installation.tex +++ b/doc/installation.tex @@ -310,12 +310,13 @@ \section{Installing from Git} Required Dependencies: -As noted in the section above on installing from tarballs, you must have: +As noted in the section above on installing from tarballs, you must have the +following dependencies installed either from source or, as shown for +Debian/Ubuntu below, by package manager: -libpopt-dev -libgoogle-glog-dev -libjson-c-dev -libjson0-dev +\begin{consolecode} +sudo apt-get install libpopt-dev libgoogle-glog-dev libjson-c-dev libjson0-dev +\end{consolecode} \begin{itemize} \item \href{http://www.gnu.org/software/autoconf/}{Autoconf} Used as part of