leptonica: adjust for tesseract expectations

Adjust include path and cmake file path so that tesseract, the only user
of the library, finds the items in place. Should unbreak the tesseract
build.

Signed-off-by: Hannu Nyman <[email protected]>

diff --git a/libs/leptonica/Makefile b/libs/leptonica/Makefile
index 2a4427c0c7c9b0ddc894355c8ac1b76206c50258..26fb923d004355314ac67f27ffdeafcbb934d917 100644 (file)
--- a/libs/leptonica/Makefile
+++ b/libs/leptonica/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=leptonica
 PKG_VERSION:=1.86.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.leptonica.org/source/
@@ -41,12 +41,12 @@ CMAKE_OPTIONS += \
 TARGET_CFLAGS:=$(filter-out -O%,$(TARGET_CFLAGS)) -O3
 
 define Build/InstallDev
-       $(INSTALL_DIR) $(1)/usr/include/leptonica
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/leptonica/*.h $(1)/usr/include/leptonica/
+       $(INSTALL_DIR) $(1)/usr/include
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/leptonica/*.h $(1)/usr/include/
        $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libleptonica.so* $(1)/usr/lib/
-       $(INSTALL_DIR) $(1)/usr/lib/cmake
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/cmake/leptonica/*.cmake $(1)/usr/lib/cmake/
+       $(INSTALL_DIR) $(1)/usr/lib/cmake/leptonica
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/cmake/leptonica/*.cmake $(1)/usr/lib/cmake/leptonica
        $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/lept.pc $(1)/usr/lib/pkgconfig/lept.pc
 endef