From 56905d86ae3bce1610e466eddb4767962b28ee04 Mon Sep 17 00:00:00 2001
From: Vitor Santos Costa <vsc@dcc.fc.up.pt>
Date: Wed, 16 Nov 2016 17:15:12 -0600
Subject: [PATCH] more Android adjusts

---
 CMakeLists.txt         |  2 --
 Packages.cmake         |  4 +++-
 Prelims.cmake          | 12 ++++++------
 library/CMakeLists.txt |  2 ++
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 34f61d613..478c0e5d3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -87,8 +87,6 @@ if (ANDROID)
     ADD_SUBDIRECTORY(os)
     ADD_SUBDIRECTORY(OPTYap)
     ADD_SUBDIRECTORY(packages/myddas)
-    ADD_SUBDIRECTORY(library/random)
-    ADD_SUBDIRECTORY(library/system)
     ADD_SUBDIRECTORY(utf8proc)
     ADD_SUBDIRECTORY(CXX)
 
diff --git a/Packages.cmake b/Packages.cmake
index 97b5c7ce8..d680ac503 100644
--- a/Packages.cmake
+++ b/Packages.cmake
@@ -50,7 +50,9 @@ add_subDIRECTORY (packages/swig)
 option (WITH_DOCS
      "generate YAP docs" OFF)
 
- # add_subDIRECTORY (docs)
+     IF (WITH_DOCS)
+  add_subDIRECTORY (docs)
+ ENDIF (WITH_DOCS)
 
 # add_subDIRECTORY (packages/cuda)
 
diff --git a/Prelims.cmake b/Prelims.cmake
index d07f05a50..d560169a7 100644
--- a/Prelims.cmake
+++ b/Prelims.cmake
@@ -128,16 +128,16 @@ endif(POLICY CMP0043)
 
 
 if (ANDROID)
-    set ( prefix ${YAP_APP_DIR}/app/src/generated )
-    set ( datarootdir ${YAP_APP_DIR}/app/src/generated/assets )
-set ( includedir "${prefix}/assets/include")
-    set ( libpl  ${YAP_APP_DIR}/app/src/generated/assets/Yap)
+    set ( prefix ${YAP_APP_DIR}/generated )
+    set ( datarootdir ${YAP_APP_DIR}/generated/assets )
+#set ( includedir "${prefix}/assets/include")
+    set ( libpl  ${YAP_APP_DIR}/generated/assets/Yap)
 else()
 set ( prefix "${CMAKE_INSTALL_PREFIX}")
-set ( datarootdir "${prefix}/share")
+    set ( datarootdir ${prefix}/share )
     set ( libpl  "${datarootdir}/Yap")
-set ( includedir "${prefix}/include")
 endif()
+set ( includedir "${prefix}/include")
 set ( exec_prefix "${prefix}")
 set ( libdir "${exec_prefix}/lib")
 set ( dlls "${exec_prefix}/lib/Yap")
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index 4aa4301fb..811f05438 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -72,6 +72,8 @@ MY_add_subdirectory(rltree)
 MY_add_subdirectory(system)
 MY_add_subdirectory(tries)
 MY_add_subdirectory(ytest)
+
+
     if (ANDROID)
     	file(INSTALL ${LIBRARY_PL}  DESTINATION ${libpl})
 else()