Merge branch 'staging'

This includes a fix to closure-size regression that moved share/doc/*/ to share/doc/
2016-04-22 16:49:09 +02:00
parent 253b84a1eb 685c34555c
commit e9379f7416
156 changed files with 1296 additions and 1104 deletions
@@ -44,6 +44,8 @@ cmakeConfigurePhase() {
    # executable. This flag makes the shared library accessible from its
    # nix/store directory.
    cmakeFlags="-DCMAKE_INSTALL_NAME_DIR=$prefix/lib $cmakeFlags"
+    cmakeFlags="-DCMAKE_INSTALL_LIBDIR=${!outputLib}/lib $cmakeFlags"
+    cmakeFlags="-DCMAKE_INSTALL_INCLUDEDIR=${!outputDev}/include $cmakeFlags"

    # Avoid cmake resetting the rpath of binaries, on make install
    # And build always Release, to ensure optimisation flags