From 4b5ae9331f697984e7b119f1f43531b28c99f958 Mon Sep 17 00:00:00 2001
From: Vitor Santos Costa <vsc@dcc.fc.up.pt>
Date: Thu, 14 Feb 2019 09:08:15 +0000
Subject: [PATCH] clpbn

---
 C/terms.c                           | 2 +-
 packages/CLPBN/CMakeLists.txt       | 2 --
 packages/CLPBN/horus/CMakeLists.txt | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/C/terms.c b/C/terms.c
index 970e04b2a..43204c5f1 100644
--- a/C/terms.c
+++ b/C/terms.c
@@ -1403,10 +1403,10 @@ static Int create_entry(Term t, Int i, Int j,  cl_connector * q, Int max) {
   } else if (IsApplTerm(t)) {
     Int me;
     h = (CELL)FunctorOfTerm(t);
-    n = ArityOfFunctor((Functor)h);
     if (IsExtensionFunctor((Functor)h)) {
       return -1;
     }
+    n = ArityOfFunctor((Functor)h);
      if (IsAtomTerm(h) &&
       (me = t_ref((cl_connector*)AtomOfTerm(h),q,max)) >= 0) {
         return me;
diff --git a/packages/CLPBN/CMakeLists.txt b/packages/CLPBN/CMakeLists.txt
index 2bf325029..0dd3e290b 100644
--- a/packages/CLPBN/CMakeLists.txt
+++ b/packages/CLPBN/CMakeLists.txt
@@ -89,14 +89,12 @@ set(
   ex/learning/train.yap
   )
 
-IF (WITH_HORUS)
 include(CheckCXXCompilerFlag)
 CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
 CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
 if(COMPILER_SUPPORTS_CXX11)
   add_subDIRECTORY (horus)
   endif()
-ENDIF()
 
 install(FILES
   ${CLPBN_TOP}
diff --git a/packages/CLPBN/horus/CMakeLists.txt b/packages/CLPBN/horus/CMakeLists.txt
index 398582a5c..ff89b3c31 100644
--- a/packages/CLPBN/horus/CMakeLists.txt
+++ b/packages/CLPBN/horus/CMakeLists.txt
@@ -68,7 +68,7 @@ if (CMAKE_MAJOR_VERSION GREATER 2)
 
 
   install(TARGETS  horus HorusCli
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    RUNTIME DESTINATION ${YAP_INSTALL_LIBDIR}
     LIBRARY DESTINATION ${YAP_INSTALL_LIBDIR}
     ARCHIVE DESTINATION ${YAP_INSTALL_LIBDIR}
     )