[uchardet: 10/29] Merge pull request #25 from Coacher/master

[Jehan Pagès <jehanp src gnome org>]

commit fcc525a64f9fe9b7cdea71f69451dea214c4783b
Merge: d255184 aa4c2ae
Author: Jehan <Jehan users noreply github com>
Date:   Thu Mar 17 19:10:39 2016 +0100

    Merge pull request #25 from Coacher/master
    
    cmake: purge remnants of opencc after b6d872bb

 src/CMakeLists.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --cc src/CMakeLists.txt
index 7a6554a,ddd2e99..f81bf34
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -43,12 -42,10 +43,12 @@@ set
  )
  
  set (UCHARDET_TARGET libuchardet)
 +if (BUILD_STATIC AND BUILD_SHARED_LIBS)
  set (UCHARDET_STATIC_TARGET libuchardet_static)
 +endif ()
  
  add_definitions(
-       -DPKGDATADIR="${DIR_SHARE_OPENCC}"
+       -DPKGDATADIR="${DIR_SHARE_UCHARDET}"
        -DLOCALEDIR="${DIR_SHARE_LOCALE}"
        -DVERSION="${UCHARDET_VERSION}"
        -DPACKAGE_NAME="${PACKAGE_NAME}"