doc/build-macos.md
branchdiphoton_M1
changeset 2258 340598e126a2
parent 2218 da5d2c04cd94
child 2296 1a12f577ac71
     1.1 --- a/doc/build-macos.md	Fri Oct 27 16:05:34 2017 +0200
     1.2 +++ b/doc/build-macos.md	Fri Oct 27 17:21:25 2017 +0200
     1.3 @@ -76,23 +76,16 @@
     1.4  mkdir ~/code/pep-engine/build
     1.5  ~~~
     1.6  
     1.7 -Note: Everything PLATFORM_OVERRIDE-related is currenty outdated. Do not rely on the documentation here!
     1.8 +Edit the build configuration to your needs in `Makefile.conf`, or create a `local.conf` that sets any of the make variables documented in `Makefile.conf`. All the default values for the build configuration variables on each platform are documented in `default.conf`.
     1.9  
    1.10 -Note: Everything Makefile.conf-related is currenty outdated. Do not rely on the documentation here!
    1.11 +If a dependency is not found in your system's default include or library paths, you will have to specify the according paths in a make variable. Typically, this has to be done at least for YML2, and libetpan.
    1.12  
    1.13 -For an explanation of the mechanics of `PLATFORM_OVERRIDE`, see the inline comments in `Makefile.conf`.
    1.14 -In this guide, the platform-specific configuration will be called `local`.
    1.15 -The installation directory will be a subdirectory of the repository.
    1.16 -This is useful for testing only.
    1.17 +For a more detailed explanation of the mechanics of these build configuration files, and overriding defaults, see the comments in `default.conf`.
    1.18 +
    1.19 +Below is a sample `./local.conf` file, for orientation.
    1.20  
    1.21  ~~~
    1.22 -export PLATFORM_OVERRIDE=local
    1.23 -~~~
    1.24 -
    1.25 -`./build-config/local.conf`:
    1.26 -
    1.27 -~~~
    1.28 -PREFIX=$(HOME)/code/pep-engine/build
    1.29 +PREFIX=$(HOME)/code/engine/build
    1.30  SYSTEM_DB=$(PREFIX)/share/pEp/system.db
    1.31  
    1.32  YML2_PATH=$(HOME)/code/yml2
    1.33 @@ -100,8 +93,8 @@
    1.34  ETPAN_LIB=-L$(HOME)/code/libetpan/build/lib
    1.35  ETPAN_INC=-I$(HOME)/code/libetpan/build/include
    1.36  
    1.37 -GPGME_LIB=-L$(HOME)/code/gpgme/build/lib
    1.38 -GPGME_INC=-I$(HOME)/code/gpgme/build/include
    1.39 +GPGME_LIB=-L$(HOME)/lib
    1.40 +GPGME_INC=-I$(HOME)/include
    1.41  ~~~
    1.42  
    1.43  The engine is built as follows: