installation patches from Keri Harris

2010-03-05 08:15:02 +00:00 · 2010-03-05 08:15:02 +00:00 · 2685a8449d
commit 2685a8449d
parent 43a1a754dd
28 changed files with 33 additions and 36 deletions
--- a/CLPQR/Makefile.in
+++ b/CLPQR/Makefile.in
@ -9,7 +9,7 @@ BINDIR = $(ROOTDIR)/bin
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(ROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 # where YAP should look for architecture-independent Prolog libraries
 #
--- a/GPL/Makefile.in
+++ b/GPL/Makefile.in
@ -9,7 +9,7 @@ BINDIR = $(ROOTDIR)/bin
 #
 # where YAP should look for binary libraries
 #
-LIBDIR=$(ROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 # where YAP should look for architecture-independent Prolog libraries
 #
--- a/LGPL/Makefile.in
+++ b/LGPL/Makefile.in
@ -9,7 +9,7 @@ BINDIR = $(ROOTDIR)/bin
 #
 # where YAP should look for binary libraries
 #
-LIBDIR=$(ROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 # where YAP should look for architecture-independent Prolog libraries
 #
--- a/LGPL/clp/Makefile.in
+++ b/LGPL/clp/Makefile.in
@ -9,7 +9,7 @@ BINDIR = $(ROOTDIR)/bin
 #
 # where YAP should look for binary libraries
 #
-LIBDIR=$(ROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 # where YAP should look for architecture-independent Prolog libraries
 #
--- a/LGPL/swi_console/Makefile.in
+++ b/LGPL/swi_console/Makefile.in
@ -8,7 +8,7 @@ EROOTDIR = @exec_prefix@
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 #
 CC=@CC@
--- a/Makefile.in
+++ b/Makefile.in
@ -12,8 +12,8 @@ BINDIR = $(EROOTDIR)/bin
 #
 # where YAP should look for binary libraries
 #
-LIBDIR=$(EROOTDIR)/lib
-YAPLIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@
+YAPLIBDIR=@libdir@/Yap
 #
 # where YAP should look for architecture-independent Prolog libraries
 #
@ -59,7 +59,7 @@ YAPSTARTUP=startup.yss
 #
 CC=@CC@
 MPI_CC=@MPI_CC@
-CPPFLAGS=@CPPFLAGS@  -I. -I$(srcdir)/H -I$(srcdir)/OPTYap -I$(srcdir)/BEAM -I$(srcdir)/packages/MYDDAS
+CPPFLAGS=@CPPFLAGS@  -I. -I$(srcdir)/H -I$(srcdir)/OPTYap -I$(srcdir)/BEAM -I$(srcdir)/MYDDAS
 CFLAGS= @CFLAGS@ $(YAP_EXTRAS) $(DEFS) $(CPPFLAGS)
 C_INTERF_FLAGS= @C_INTERF_FLAGS@ $(YAP_EXTRAS) $(DEFS) $(CPPFLAGS) -I$(srcdir)/include
 C_PARSER_FLAGS= @C_PARSER_FLAGS@ $(YAP_EXTRAS) $(DEFS) $(CPPFLAGS)
@ -499,7 +499,7 @@ libYap.a: $(LIB_OBJECTS)
 	$(RANLIB) libYap.a

@DYNYAPLIB@: $(LIB_OBJECTS)
-	@DYNLIB_LD@ -o @YAPLIB@ $(LIB_OBJECTS) $(LIBS) $(LDFLGS)
+	@DYNLIB_LD@ -o @YAPLIB@ $(LIB_OBJECTS) $(LIBS) $(LDFLAGS)

 install: install_bin install_data

--- a/library/Makefile.in
+++ b/library/Makefile.in
@ -9,7 +9,7 @@ BINDIR = $(ROOTDIR)/bin
 #
 # where YAP should look for binary libraries
 #
-LIBDIR=$(ROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 # where YAP should look for architecture-independent Prolog libraries
 #
--- a/library/lammpi/Makefile.in
+++ b/library/lammpi/Makefile.in
@ -17,7 +17,7 @@ BINDIR = $(EROOTDIR)/bin
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 #
 CC=@CC@
--- a/library/matlab/Makefile.in
+++ b/library/matlab/Makefile.in
@ -13,7 +13,7 @@ BINDIR = $(EROOTDIR)/bin
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 #
 CC=@CC@
--- a/library/matrices/Makefile.in
+++ b/library/matrices/Makefile.in
@ -13,7 +13,7 @@ BINDIR = $(EROOTDIR)/bin
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 #
 CC=@CC@
--- a/library/matrix/Makefile.in
+++ b/library/matrix/Makefile.in
@ -13,7 +13,7 @@ BINDIR = $(EROOTDIR)/bin
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 #
 CC=@CC@
--- a/library/mpi/Makefile.in
+++ b/library/mpi/Makefile.in
@ -21,8 +21,8 @@ BINDIR = $(EROOTDIR)/bin
 #
 # where YAP should look for binary libraries
 #
-LIBDIR=$(EROOTDIR)/lib
-YAPLIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@
+YAPLIBDIR=@libdir@/Yap
 #
 # where YAP should look for architecture-independent Prolog libraries
 #
--- a/library/mpi/mpi.c
+++ b/library/mpi/mpi.c
@ -26,9 +26,6 @@ static char *rcsid = "$Header: /Users/vitor/Yap/yap-cvsbackup/library/mpi/mpi.c,
 #include "Yatom.h"
 #include "yapio.h"

-/* for AtomEof */
-#include "Heap.h"
-
 #include <stdlib.h>
 #include <string.h>
 #include <mpi.h>
--- a/library/random/Makefile.in
+++ b/library/random/Makefile.in
@ -13,7 +13,7 @@ BINDIR = $(EROOTDIR)/bin
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 #
 CC=@CC@
--- a/library/regex/Makefile.in
+++ b/library/regex/Makefile.in
@ -13,7 +13,7 @@ BINDIR = $(EROOTDIR)/bin
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 #
 CC=@CC@
--- a/library/rltree/Makefile.in
+++ b/library/rltree/Makefile.in
@ -17,7 +17,7 @@ BINDIR = $(EROOTDIR)/bin
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 #
 CC=@CC@
--- a/library/system/Makefile.in
+++ b/library/system/Makefile.in
@ -13,7 +13,7 @@ BINDIR = $(EROOTDIR)/bin
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 #
 CC=@CC@
--- a/library/tries/Makefile.in
+++ b/library/tries/Makefile.in
@ -13,7 +13,7 @@ BINDIR = $(EROOTDIR)/bin
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 #
 CC=@CC@
--- a/library/yap2swi/Makefile.in
+++ b/library/yap2swi/Makefile.in
@ -13,7 +13,7 @@ BINDIR = $(EROOTDIR)/bin
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 #
 CC=@CC@
--- a/packages/CLPBN/Makefile.in
+++ b/packages/CLPBN/Makefile.in
@ -9,7 +9,7 @@ BINDIR = $(ROOTDIR)/bin
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(ROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 # where YAP should look for architecture-independent Prolog libraries
 #
--- a/packages/PLStream/Makefile.in
+++ b/packages/PLStream/Makefile.in
@ -14,7 +14,7 @@ BINDIR = $(EROOTDIR)/bin
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 #
 CC=@CC@
--- a/packages/ProbLog/Makefile.in
+++ b/packages/ProbLog/Makefile.in
@ -9,7 +9,7 @@ BINDIR = $(ROOTDIR)/bin
 #
 # where YAP should look for binary libraries
 #
-LIBDIR=$(ROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 # where YAP should look for architecture-independent Prolog libraries
 #
--- a/packages/ProbLog/simplecudd/Makefile.in
+++ b/packages/ProbLog/simplecudd/Makefile.in
@ -13,7 +13,7 @@ BINDIR = $(EROOTDIR)/bin
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 #
 CC=@CC@
--- a/packages/cplint/Makefile.in
+++ b/packages/cplint/Makefile.in
@ -12,7 +12,7 @@ BINDIR = $(ROOTDIR)/bin
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(ROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 # where YAP should look for architecture-independent Prolog libraries
 #
--- a/packages/plunit/Makefile.in
+++ b/packages/plunit/Makefile.in
@ -17,9 +17,9 @@ EROOTDIR = @exec_prefix@
 srcdir=@srcdir@

 BINDIR = $(EROOTDIR)/bin
-LIBDIR=$(EROOTDIR)/lib
+LIBDIR=@libdir@
 SHAREDIR=$(EROOTDIR)/share/Yap
-YAPLIBDIR=$(EROOTDIR)/lib/Yap
+YAPLIBDIR=@libdir@/Yap

 PL=@EXTEND_DYNLOADER_PATH@ $(DESTDIR)$(BINDIR)/yap $(DESTDIR)$(YAPLIBDIR)/startup.yss
 LN_S=@LN_S@
--- a/packages/sgml/Makefile.in
+++ b/packages/sgml/Makefile.in
@ -16,8 +16,8 @@ abs_top_builddir = @abs_top_builddir@
 srcdir=@srcdir@

 BINDIR = $(EROOTDIR)/bin
-LIBDIR=$(EROOTDIR)/lib
-YAPLIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@
+YAPLIBDIR=@libdir@/Yap
 SHAREDIR=$(ROOTDIR)/share/Yap

 SHELL=@SHELL@
--- a/packages/swi-minisat2/C/Makefile.in
+++ b/packages/swi-minisat2/C/Makefile.in
@ -14,7 +14,7 @@ BINDIR = $(EROOTDIR)/bin
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 #
 CC=@CC@
--- a/packages/swi-minisat2/Makefile.in
+++ b/packages/swi-minisat2/Makefile.in
@ -9,7 +9,7 @@ BINDIR = $(ROOTDIR)/bin
 #
 # where YAP should look for binary libraries
 #
-LIBDIR=$(ROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 # where YAP should look for architecture-independent Prolog libraries
 #