From 3333ca7d6942b270048d76f9fd8729d4d2f5f21e Mon Sep 17 00:00:00 2001
From: Laurent Arnoud <laurent@spkdev.net>
Date: Tue, 2 May 2017 20:28:48 +0200
Subject: [PATCH] Fix pkgconfig install path on package

---
 CMakeLists.txt   | 6 ++----
 README/BUILD.md  | 8 ++++++++
 tidy.pc.cmake.in | 6 ++++--
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 834e8c4..b459f5f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -205,7 +205,7 @@ if (NOT BIN_INSTALL_DIR)
 endif ()
 
 if (NOT INCLUDE_INSTALL_DIR)
-    set(INCLUDE_INSTALL_DIR include)
+    set(INCLUDE_INSTALL_DIR include/${LIB_NAME})
 endif ()
 
 # Always build the STATIC library
@@ -408,8 +408,6 @@ endif ()
 include(CPack)
 
 # pkg-config
-set(INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}" CACHE PATH "Installation directory for libraries")
-set(INSTALL_INCDIR "${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}" CACHE PATH "Installation directory for headers")
 configure_file(
     "${CMAKE_CURRENT_SOURCE_DIR}/${LIB_NAME}.pc.cmake.in"
     "${CMAKE_CURRENT_BINARY_DIR}/${LIB_NAME}.pc"
@@ -417,7 +415,7 @@ configure_file(
     )
 install(FILES
     "${CMAKE_CURRENT_BINARY_DIR}/${LIB_NAME}.pc"
-    DESTINATION "${INSTALL_LIBDIR}/pkgconfig"
+    DESTINATION "${LIB_INSTALL_DIR}/pkgconfig"
     )
 
 # eof
diff --git a/README/BUILD.md b/README/BUILD.md
index 6ae5bbb..e427752 100644
--- a/README/BUILD.md
+++ b/README/BUILD.md
@@ -40,6 +40,14 @@ If you do **not** need the tidy library built as a 'shared' (DLL) library, then
 
 See the `CMakeLists.txt` file for other CMake **options** offered.
 
+## Build the tidy packages
+
+  1. `cd build/cmake`
+
+  2. `cmake ../.. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr`
+
+  3. Unix/OS X: `make package`
+
 ## Build PHP with the tidy-html5 library
 
 Due to API changes in the PHP source, `buffio.h` needs to be renamed to `tidybuffio.h` in the file `ext/tidy/tidy.c` in PHP's source.
diff --git a/tidy.pc.cmake.in b/tidy.pc.cmake.in
index 96e7262..7d819f1 100644
--- a/tidy.pc.cmake.in
+++ b/tidy.pc.cmake.in
@@ -1,5 +1,7 @@
-libdir=@INSTALL_LIBDIR@
-includedir=@INSTALL_INCDIR@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}
+libdir=${exec_prefix}/@LIB_INSTALL_DIR@
+includedir=${prefix}/@INCLUDE_INSTALL_DIR@
 
 Name: @LIB_NAME@
 Description: @LIBTIDY_DESCRIPTION@