diff options
author | Samuel Alfageme <samuel.alfageme@gmail.com> | 2017-04-03 15:49:41 +0300 |
---|---|---|
committer | Markus Goetz <markus@woboq.com> | 2017-04-03 22:19:39 +0300 |
commit | ae018eab42905c992699794c046ab83db5668eb2 (patch) | |
tree | 2732d20d9de9c4b75dceb8dadd77aa5fd4103f25 /doc | |
parent | 68f0f1b404485ffc4f5127784eb4ff52919953ad (diff) |
Fixing a duplicate in the build instructions
- The duplicate and some typos were introduced in 42aed56a5a92a32b86e2bdd1c6e9d75e27728c8b
- Also fixes some minor format issues. There's a lot of notes in this docs, we should refactor some.
Diffstat (limited to 'doc')
-rw-r--r-- | doc/building.rst | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/doc/building.rst b/doc/building.rst index d48808520..1e3a927bb 100644 --- a/doc/building.rst +++ b/doc/building.rst @@ -99,12 +99,12 @@ To set up your build environment for development using HomeBrew_: 10. Install the Packages_ package creation tool. -11. In the build directory, run ``admin/osx/create_mac.sh <build_dir> - <install_dir>``. If you have a developer signing certificate, you can specify - its Common Name as a third parameter (use quotes) to have the package - signed automatically. +11. In the build directory, run ``admin/osx/create_mac.sh <build_dir> <install_dir>``. + If you have a developer signing certificate, you can specify + its Common Name as a third parameter (use quotes) to have the package + signed automatically. - .. note:: Contrary to earlier versions, ownCloud 1.7 and later are packaged + .. note:: Contrary to earlier versions, ownCloud 1.7 and later are packaged as a ``pkg`` installer. Do not call "make package" at any time when compiling for OS X, as this will build a disk image, and will not work correctly. @@ -240,8 +240,8 @@ To build the most up-to-date version of the client: 3. Configure the client build:: - cmake -DCMAKE_BUILD_TYPE="Debug" .. - + cmake -DCMAKE_BUILD_TYPE="Debug" .. + .. note:: You must use absolute paths for the ``include`` and ``library`` directories. @@ -249,14 +249,10 @@ To build the most up-to-date version of the client: where ``target`` is a private location, i.e. in parallel to your build dir by specifying ``../install``. - ..note:: qtkeychain must be compiled with the same prefix e.g CMAKE_INSTALL_PREFIX=/Users/path/to/client/install/ - - .. note:: Example:: cmake -DCMAKE_PREFIX_PATH=/usr/local/opt/qt5 -DCMAKE_INSTALL_PREFIX=/Users/path/to/client/install/ -D_OPENSSL_LIBDIR=/usr/local/opt/openssl/lib/ -D_OPENSSL_INCLUDEDIR=/usr/local/opt/openssl/include/ -DOPENSSL_INCLUDE_DIR=/usr/local/opt/openssl/include/ -DNO_SHIBBOLETH=1 - - .. note:: Example:: cmake -DCMAKE_PREFIX_PATH=/usr/local/opt/qt5 -DCMAKE_INSTALL_PREFIX=/Users/path/to/client/install/ -D_OPENSSL_LIBDIR=/usr/local/opt/openssl/lib/ -D_OPENSSL_INCLUDEDIR=/usr/local/opt/openssl/include/ -D_OPENSSL_VERSION=1.0.2a -DOPENSSL_INCLUDE_DIR=/usr/local/opt/openssl/include/ -DNO_SHIBBOLETH=1 - - qtkeychain must be compiled with the same prefix e.g CMAKE_INSTALL_PREFIX=/Users/path/to/client/install/ . - + .. note:: qtkeychain must be compiled with the same prefix e.g ``CMAKE_INSTALL_PREFIX=/Users/path/to/client/install/ .`` + + .. note:: Example:: ``cmake -DCMAKE_PREFIX_PATH=/usr/local/opt/qt5 -DCMAKE_INSTALL_PREFIX=/Users/path/to/client/install/ -D_OPENSSL_LIBDIR=/usr/local/opt/openssl/lib/ -D_OPENSSL_INCLUDEDIR=/usr/local/opt/openssl/include/ -D_OPENSSL_VERSION=1.0.2a -DOPENSSL_INCLUDE_DIR=/usr/local/opt/openssl/include/ -DNO_SHIBBOLETH=1`` + 4. Call ``make``. The owncloud binary will appear in the ``bin`` directory. |