From 6e6738b199ebe3e4f1dc216ba99b4689f266dba4 Mon Sep 17 00:00:00 2001
From: Vitor Santos Costa <vsc@dcc.fc.up.pt>
Date: Sun, 27 Aug 2017 22:26:44 +0100
Subject: [PATCH] varia

---
 H/rclause.h                    | 11 +++--------
 misc/buildops                  |  5 -----
 packages/raptor/CMakeLists.txt |  6 +++---
 pl/meta.yap                    |  2 +-
 4 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/H/rclause.h b/H/rclause.h
index 3e77956b0..ff11ebb17 100644
--- a/H/rclause.h
+++ b/H/rclause.h
@@ -78,6 +78,9 @@ restore_opcodes(yamop *pc, yamop *max USES_REGS)
     case _call:
     case _call_cpred:
     case _call_usercpred:
+    case _dexecute:
+    case _execute:
+    case _execute_cpred:
     case _fcall:
     case _p_execute2:
       OrArgAdjust(pc->y_u.Osbpp.or_arg);
@@ -479,14 +482,6 @@ restore_opcodes(yamop *pc, yamop *max USES_REGS)
       pc->y_u.plyys.flags = ConstantAdjust(pc->y_u.plyys.flags);
       pc = NEXTOP(pc,plyys);
       break;
-      /* instructions type pp */
-    case _dexecute:
-    case _execute:
-    case _execute_cpred:
-      pc->y_u.pp.p = PtoPredAdjust(pc->y_u.pp.p);
-      pc->y_u.pp.p0 = PtoPredAdjust(pc->y_u.pp.p0);
-      pc = NEXTOP(pc,pp);
-      break;
       /* instructions type s */
     case _cut:
     case _cut_e:
diff --git a/misc/buildops b/misc/buildops
index d1ea1c053..3aaa2e8ec 100644
--- a/misc/buildops
+++ b/misc/buildops
@@ -399,11 +399,6 @@ output_walk(C,"Osbpp",[Op|_]) :-
 	walk_to_meta_call(C).
 output_walk(C,"Osbpp",_) :- !,
 	label_in_clause(C,"Osbpp","p0").
-output_walk(C,"pp",[Op|_]) :-
-	c_call_op(Op), !,
-	walk_to_c_code(C,"pp","p").
-output_walk(C,"pp",_) :- !,
-	label_in_clause(C,"pp","p0").
 output_walk(C,"OtapFs",_) :- !,
 	label_in_clause(C,"OtapFs","p").
 output_walk(C,"Otapl",_) :- !,
diff --git a/packages/raptor/CMakeLists.txt b/packages/raptor/CMakeLists.txt
index b709bab7c..489b66568 100644
--- a/packages/raptor/CMakeLists.txt
+++ b/packages/raptor/CMakeLists.txt
@@ -54,9 +54,9 @@ else (WIN32)
   endif()
   
    install(TARGETS  libxml2
-           LIBRARY DESTINATION ${libdir}
+           LIBRARY DESTINATION ${dlls}
     RUNTIME DESTINATION ${dlls}
-     ARCHIVE DESTINATION ${dlls}
+     ARCHIVE DESTINATION ${libdir}
    )
 endif(WIN32)
 
@@ -111,7 +111,7 @@ IF (RAPTOR_FOUND)
   install(TARGETS  raptor
           LIBRARY DESTINATION ${dlls}
           RUNTIME DESTINATION ${dlls}
-    ARCHIVE DESTINATION ${dlls}
+    ARCHIVE DESTINATION ${libdir}
 
     )
 
diff --git a/pl/meta.yap b/pl/meta.yap
index b8e2810e7..042372e73 100644
--- a/pl/meta.yap
+++ b/pl/meta.yap
@@ -6,7 +6,7 @@
  @ingroup YAPModules
  @{
 
-  @pred meta_predicate(_G1_,...., _Gn) is directive
+  @pred meta_predicate(G1 , Gj , Gn) is directive
 
 Declares that this predicate manipulates references to predicates.
 Each _Gi_ is a mode specification.