Merge lp:~townsend/libertine/fix-pkgconfig into lp:libertine

[Christopher Townsend]

Revert the removal of the liblibertine_headers_path variable to fix libertine.pc configuration.

[lp:~townsend/libertine/fix-pkgconfig]

328. By Christopher Townsend on 2016-11-03

Add comment.

[Libertine CI Bot (libertine-ci-bot)]

PASSED: Continuous integration, rev:327
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/199/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/447
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=default/354
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/354
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=zesty,testname=default/354
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=vivid+overlay,testname=default/354
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/354
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=zesty,testname=default/354
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/449
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/429
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/429/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/429
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/429/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/429
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/429/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/429
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/429/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/429
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/429/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/429
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/429/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/199/rebuild

review: Approve (continuous-integration)

[Larry Price (larryprice)]

lgtm, thanks for cleaning up my mess (:

review: Approve

=== modified file 'liblibertine/CMakeLists.txt'
--- liblibertine/CMakeLists.txt	2016-09-26 18:17:07 +0000
+++ liblibertine/CMakeLists.txt	2016-11-03 19:20:34 +0000
@@ -24,7 +24,9 @@
   Qt5::Core
 )
 
-install(FILES libertine.h DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/liblibertine")
+# "liblibertine_headers_path" is used in libertine.pc.in
+set(liblibertine_headers_path "${CMAKE_INSTALL_FULL_INCLUDEDIR}/liblibertine")
+install(FILES libertine.h DESTINATION ${liblibertine_headers_path})
 install(TARGETS ${LIBERTINE_CORE} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
 configure_file(libertine.pc.in ${CMAKE_BINARY_DIR}/libertine.pc @ONLY)