From e33712403f25a0c01e91ee528e8b026afeaac71d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADtor=20Santos=20Costa?= <vsc@dcc.fc.up.pt>
Date: Fri, 18 Nov 2011 18:33:22 +0000
Subject: [PATCH] fix prism compilation and PRISM overflow handling.

---
 packages/prism/src/c/Makefile.in | 8 +++++---
 packages/prism/src/c/up/graph.c  | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/prism/src/c/Makefile.in b/packages/prism/src/c/Makefile.in
index 96ada7b1e..b3d80ef7b 100644
--- a/packages/prism/src/c/Makefile.in
+++ b/packages/prism/src/c/Makefile.in
@@ -16,6 +16,7 @@ BINDIR = $(EROOTDIR)/bin
 #
 # where YAP should look for libraries
 #
+TARGETS=	prism.@SO@
 LIBDIR=@libdir@
 YAPLIBDIR=@libdir@/Yap
 YAP_EXTRAS=@YAP_EXTRAS@ -D_YAP_NOT_INSTALLED_=1  -D__YAP_PROLOG__=1
@@ -38,6 +39,7 @@ SO=@SO@
 #4.1VPATH=@srcdir@:@srcdir@/OPTYap
 CWD=$(PWD)
 #
+RM=rm -f
 
 ##----------------------------------------------------------------------
 
@@ -71,9 +73,9 @@ mp/%.o: $(srcdir)/mp/%.c
 @DO_SECOND_LD@prism.@SO@: $(OBJS)
 @DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o $@ $(OBJS)  @EXTRA_LIBS_FOR_DLLS@
 
-all: $(TARGET)
+all: $(TARGETS)
 
-install: $(TARGET)
+install: $(TARGETS)
 	$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
 
 clean: clean_subdirs
@@ -81,7 +83,7 @@ clean: clean_subdirs
 
 clean_subdirs:
 	for i in $(SUBDIRS); do                     \
-	  ($(MAKE) -f $(MAKEFILE) -C $$i clean )    \
+	  $(RM) $$i/*.o;                            \
 	done
 
 ##----------------------------------------------------------------------
diff --git a/packages/prism/src/c/up/graph.c b/packages/prism/src/c/up/graph.c
index 153316e5c..385e25cc4 100644
--- a/packages/prism/src/c/up/graph.c
+++ b/packages/prism/src/c/up/graph.c
@@ -797,7 +797,7 @@ int pc_import_occ_switches_3(void)
 	  /* running out of stack */
 	  extern int Yap_gcl(UInt gc_lim, Int predarity, CELL *current_env, yamop *nextop);
 
-	  Yap_gcl(4*64*1024, 3, ENV, P);
+	  Yap_gcl(4*64*1024, 3, ENV, CP);
 	  goto restart;
 	}
 #endif