From a3f360e31a2c5485e11f949987221be741be0472 Mon Sep 17 00:00:00 2001
From: Jan Wielemaker <wielemak@science.uva.nl>
Date: Wed, 27 Aug 2008 11:58:19 +0200
Subject: [PATCH] Remove building chr_support.so and fix portability generating
 the library index

---
 Makefile.in  | 8 +++++---
 configure.in | 3 ++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 98499bc..6b0a482 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -27,6 +27,7 @@ LN_S=@LN_S@
 #
 CC=@CC@
 CFLAGS= @CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include
+MKINDEX=true
 
 else	# SWI
 
@@ -54,6 +55,8 @@ LIBS=@LIBS@
 LD=@LD@
 LDFLAGS=@LDSOFLAGS@
 
+MKINDEX=$(PL) -f none -g make -t halt
+
 DOCTOTEX=$(PCEHOME)/bin/doc2tex
 PLTOTEX=$(PCEHOME)/bin/pl2tex
 LATEX=latex
@@ -76,7 +79,7 @@ INSTALL_DATA=@INSTALL_DATA@
 
 LIBPL=		$(srcdir)/chr_runtime.pl $(srcdir)/chr_op.pl \
 		chr_translate.pl $(srcdir)/chr_debug.pl \
-		$(srcdir)/chr_messages.pl $(srcdir)/hprolog.pl \
+		$(srcdir)/chr_messages.pl \
 		$(srcdir)/pairlist.pl $(srcdir)/clean_code.pl \
 		$(srcdir)/find.pl $(srcdir)/a_star.pl \
 		$(srcdir)/binomialheap.pl $(srcdir)/builtins.pl \
@@ -153,8 +156,7 @@ install:	$(LIBPL)
 		$(INSTALL_DATA) $(LIBPL) $(DESTDIR)$(CHRDIR)
 		$(INSTALL_DATA) $(CHRPL) $(DESTDIR)$(SHAREDIR)/chr.pl
 		$(INSTALL_DATA) $(srcdir)/README   $(DESTDIR)$(CHRDIR)
-		@IN_SWI@$(PL) -f none -g make -t halt
-		@IN_YAP@$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(LIBDIR)
+		$(MKINDEX)
 
 ln-install::
 		@$(MAKE) INSTALL_DATA='../ln-install' install
diff --git a/configure.in b/configure.in
index cc509c5..d529c41 100644
--- a/configure.in
+++ b/configure.in
@@ -52,7 +52,8 @@ CMFLAGS=-fpic
 
 SO="$PLSOEXT"
 
-CHR_TARGETS="chr_support.$SO"
+dnl Currently not used
+dnl CHR_TARGETS="chr_support.$SO"
 AC_CHECK_PROGS(MAKE, gmake make, "make")
 AC_PROG_INSTALL
 if test ! -z "$GCC"; then
-- 
2.11.4.GIT