installation patches from Keri Harris
This commit is contained in:
parent
43a1a754dd
commit
2685a8449d
@ -9,7 +9,7 @@ BINDIR = $(ROOTDIR)/bin
|
|||||||
#
|
#
|
||||||
# where YAP should look for libraries
|
# where YAP should look for libraries
|
||||||
#
|
#
|
||||||
LIBDIR=$(ROOTDIR)/lib/Yap
|
LIBDIR=@libdir@/Yap
|
||||||
#
|
#
|
||||||
# where YAP should look for architecture-independent Prolog libraries
|
# where YAP should look for architecture-independent Prolog libraries
|
||||||
#
|
#
|
||||||
|
@ -9,7 +9,7 @@ BINDIR = $(ROOTDIR)/bin
|
|||||||
#
|
#
|
||||||
# where YAP should look for binary libraries
|
# where YAP should look for binary libraries
|
||||||
#
|
#
|
||||||
LIBDIR=$(ROOTDIR)/lib/Yap
|
LIBDIR=@libdir@/Yap
|
||||||
#
|
#
|
||||||
# where YAP should look for architecture-independent Prolog libraries
|
# where YAP should look for architecture-independent Prolog libraries
|
||||||
#
|
#
|
||||||
|
@ -9,7 +9,7 @@ BINDIR = $(ROOTDIR)/bin
|
|||||||
#
|
#
|
||||||
# where YAP should look for binary libraries
|
# where YAP should look for binary libraries
|
||||||
#
|
#
|
||||||
LIBDIR=$(ROOTDIR)/lib/Yap
|
LIBDIR=@libdir@/Yap
|
||||||
#
|
#
|
||||||
# where YAP should look for architecture-independent Prolog libraries
|
# where YAP should look for architecture-independent Prolog libraries
|
||||||
#
|
#
|
||||||
|
@ -9,7 +9,7 @@ BINDIR = $(ROOTDIR)/bin
|
|||||||
#
|
#
|
||||||
# where YAP should look for binary libraries
|
# where YAP should look for binary libraries
|
||||||
#
|
#
|
||||||
LIBDIR=$(ROOTDIR)/lib/Yap
|
LIBDIR=@libdir@/Yap
|
||||||
#
|
#
|
||||||
# where YAP should look for architecture-independent Prolog libraries
|
# where YAP should look for architecture-independent Prolog libraries
|
||||||
#
|
#
|
||||||
|
@ -8,7 +8,7 @@ EROOTDIR = @exec_prefix@
|
|||||||
#
|
#
|
||||||
# where YAP should look for libraries
|
# where YAP should look for libraries
|
||||||
#
|
#
|
||||||
LIBDIR=$(EROOTDIR)/lib/Yap
|
LIBDIR=@libdir@/Yap
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
CC=@CC@
|
CC=@CC@
|
||||||
|
@ -12,8 +12,8 @@ BINDIR = $(EROOTDIR)/bin
|
|||||||
#
|
#
|
||||||
# where YAP should look for binary libraries
|
# where YAP should look for binary libraries
|
||||||
#
|
#
|
||||||
LIBDIR=$(EROOTDIR)/lib
|
LIBDIR=@libdir@
|
||||||
YAPLIBDIR=$(EROOTDIR)/lib/Yap
|
YAPLIBDIR=@libdir@/Yap
|
||||||
#
|
#
|
||||||
# where YAP should look for architecture-independent Prolog libraries
|
# where YAP should look for architecture-independent Prolog libraries
|
||||||
#
|
#
|
||||||
@ -59,7 +59,7 @@ YAPSTARTUP=startup.yss
|
|||||||
#
|
#
|
||||||
CC=@CC@
|
CC=@CC@
|
||||||
MPI_CC=@MPI_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)
|
CFLAGS= @CFLAGS@ $(YAP_EXTRAS) $(DEFS) $(CPPFLAGS)
|
||||||
C_INTERF_FLAGS= @C_INTERF_FLAGS@ $(YAP_EXTRAS) $(DEFS) $(CPPFLAGS) -I$(srcdir)/include
|
C_INTERF_FLAGS= @C_INTERF_FLAGS@ $(YAP_EXTRAS) $(DEFS) $(CPPFLAGS) -I$(srcdir)/include
|
||||||
C_PARSER_FLAGS= @C_PARSER_FLAGS@ $(YAP_EXTRAS) $(DEFS) $(CPPFLAGS)
|
C_PARSER_FLAGS= @C_PARSER_FLAGS@ $(YAP_EXTRAS) $(DEFS) $(CPPFLAGS)
|
||||||
@ -499,7 +499,7 @@ libYap.a: $(LIB_OBJECTS)
|
|||||||
$(RANLIB) libYap.a
|
$(RANLIB) libYap.a
|
||||||
|
|
||||||
@DYNYAPLIB@: $(LIB_OBJECTS)
|
@DYNYAPLIB@: $(LIB_OBJECTS)
|
||||||
@DYNLIB_LD@ -o @YAPLIB@ $(LIB_OBJECTS) $(LIBS) $(LDFLGS)
|
@DYNLIB_LD@ -o @YAPLIB@ $(LIB_OBJECTS) $(LIBS) $(LDFLAGS)
|
||||||
|
|
||||||
install: install_bin install_data
|
install: install_bin install_data
|
||||||
|
|
||||||
|
@ -9,7 +9,7 @@ BINDIR = $(ROOTDIR)/bin
|
|||||||
#
|
#
|
||||||
# where YAP should look for binary libraries
|
# where YAP should look for binary libraries
|
||||||
#
|
#
|
||||||
LIBDIR=$(ROOTDIR)/lib/Yap
|
LIBDIR=@libdir@/Yap
|
||||||
#
|
#
|
||||||
# where YAP should look for architecture-independent Prolog libraries
|
# where YAP should look for architecture-independent Prolog libraries
|
||||||
#
|
#
|
||||||
|
@ -17,7 +17,7 @@ BINDIR = $(EROOTDIR)/bin
|
|||||||
#
|
#
|
||||||
# where YAP should look for libraries
|
# where YAP should look for libraries
|
||||||
#
|
#
|
||||||
LIBDIR=$(EROOTDIR)/lib/Yap
|
LIBDIR=@libdir@/Yap
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
CC=@CC@
|
CC=@CC@
|
||||||
|
@ -13,7 +13,7 @@ BINDIR = $(EROOTDIR)/bin
|
|||||||
#
|
#
|
||||||
# where YAP should look for libraries
|
# where YAP should look for libraries
|
||||||
#
|
#
|
||||||
LIBDIR=$(EROOTDIR)/lib/Yap
|
LIBDIR=@libdir@/Yap
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
CC=@CC@
|
CC=@CC@
|
||||||
|
@ -13,7 +13,7 @@ BINDIR = $(EROOTDIR)/bin
|
|||||||
#
|
#
|
||||||
# where YAP should look for libraries
|
# where YAP should look for libraries
|
||||||
#
|
#
|
||||||
LIBDIR=$(EROOTDIR)/lib/Yap
|
LIBDIR=@libdir@/Yap
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
CC=@CC@
|
CC=@CC@
|
||||||
|
@ -13,7 +13,7 @@ BINDIR = $(EROOTDIR)/bin
|
|||||||
#
|
#
|
||||||
# where YAP should look for libraries
|
# where YAP should look for libraries
|
||||||
#
|
#
|
||||||
LIBDIR=$(EROOTDIR)/lib/Yap
|
LIBDIR=@libdir@/Yap
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
CC=@CC@
|
CC=@CC@
|
||||||
|
@ -21,8 +21,8 @@ BINDIR = $(EROOTDIR)/bin
|
|||||||
#
|
#
|
||||||
# where YAP should look for binary libraries
|
# where YAP should look for binary libraries
|
||||||
#
|
#
|
||||||
LIBDIR=$(EROOTDIR)/lib
|
LIBDIR=@libdir@
|
||||||
YAPLIBDIR=$(EROOTDIR)/lib/Yap
|
YAPLIBDIR=@libdir@/Yap
|
||||||
#
|
#
|
||||||
# where YAP should look for architecture-independent Prolog libraries
|
# where YAP should look for architecture-independent Prolog libraries
|
||||||
#
|
#
|
||||||
|
@ -26,9 +26,6 @@ static char *rcsid = "$Header: /Users/vitor/Yap/yap-cvsbackup/library/mpi/mpi.c,
|
|||||||
#include "Yatom.h"
|
#include "Yatom.h"
|
||||||
#include "yapio.h"
|
#include "yapio.h"
|
||||||
|
|
||||||
/* for AtomEof */
|
|
||||||
#include "Heap.h"
|
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <mpi.h>
|
#include <mpi.h>
|
||||||
|
@ -13,7 +13,7 @@ BINDIR = $(EROOTDIR)/bin
|
|||||||
#
|
#
|
||||||
# where YAP should look for libraries
|
# where YAP should look for libraries
|
||||||
#
|
#
|
||||||
LIBDIR=$(EROOTDIR)/lib/Yap
|
LIBDIR=@libdir@/Yap
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
CC=@CC@
|
CC=@CC@
|
||||||
|
@ -13,7 +13,7 @@ BINDIR = $(EROOTDIR)/bin
|
|||||||
#
|
#
|
||||||
# where YAP should look for libraries
|
# where YAP should look for libraries
|
||||||
#
|
#
|
||||||
LIBDIR=$(EROOTDIR)/lib/Yap
|
LIBDIR=@libdir@/Yap
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
CC=@CC@
|
CC=@CC@
|
||||||
|
@ -17,7 +17,7 @@ BINDIR = $(EROOTDIR)/bin
|
|||||||
#
|
#
|
||||||
# where YAP should look for libraries
|
# where YAP should look for libraries
|
||||||
#
|
#
|
||||||
LIBDIR=$(EROOTDIR)/lib/Yap
|
LIBDIR=@libdir@/Yap
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
CC=@CC@
|
CC=@CC@
|
||||||
|
@ -13,7 +13,7 @@ BINDIR = $(EROOTDIR)/bin
|
|||||||
#
|
#
|
||||||
# where YAP should look for libraries
|
# where YAP should look for libraries
|
||||||
#
|
#
|
||||||
LIBDIR=$(EROOTDIR)/lib/Yap
|
LIBDIR=@libdir@/Yap
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
CC=@CC@
|
CC=@CC@
|
||||||
|
@ -13,7 +13,7 @@ BINDIR = $(EROOTDIR)/bin
|
|||||||
#
|
#
|
||||||
# where YAP should look for libraries
|
# where YAP should look for libraries
|
||||||
#
|
#
|
||||||
LIBDIR=$(EROOTDIR)/lib/Yap
|
LIBDIR=@libdir@/Yap
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
CC=@CC@
|
CC=@CC@
|
||||||
|
@ -13,7 +13,7 @@ BINDIR = $(EROOTDIR)/bin
|
|||||||
#
|
#
|
||||||
# where YAP should look for libraries
|
# where YAP should look for libraries
|
||||||
#
|
#
|
||||||
LIBDIR=$(EROOTDIR)/lib/Yap
|
LIBDIR=@libdir@/Yap
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
CC=@CC@
|
CC=@CC@
|
||||||
|
@ -9,7 +9,7 @@ BINDIR = $(ROOTDIR)/bin
|
|||||||
#
|
#
|
||||||
# where YAP should look for libraries
|
# where YAP should look for libraries
|
||||||
#
|
#
|
||||||
LIBDIR=$(ROOTDIR)/lib/Yap
|
LIBDIR=@libdir@/Yap
|
||||||
#
|
#
|
||||||
# where YAP should look for architecture-independent Prolog libraries
|
# where YAP should look for architecture-independent Prolog libraries
|
||||||
#
|
#
|
||||||
|
@ -14,7 +14,7 @@ BINDIR = $(EROOTDIR)/bin
|
|||||||
#
|
#
|
||||||
# where YAP should look for libraries
|
# where YAP should look for libraries
|
||||||
#
|
#
|
||||||
LIBDIR=$(EROOTDIR)/lib/Yap
|
LIBDIR=@libdir@/Yap
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
CC=@CC@
|
CC=@CC@
|
||||||
|
@ -9,7 +9,7 @@ BINDIR = $(ROOTDIR)/bin
|
|||||||
#
|
#
|
||||||
# where YAP should look for binary libraries
|
# where YAP should look for binary libraries
|
||||||
#
|
#
|
||||||
LIBDIR=$(ROOTDIR)/lib/Yap
|
LIBDIR=@libdir@/Yap
|
||||||
#
|
#
|
||||||
# where YAP should look for architecture-independent Prolog libraries
|
# where YAP should look for architecture-independent Prolog libraries
|
||||||
#
|
#
|
||||||
|
@ -13,7 +13,7 @@ BINDIR = $(EROOTDIR)/bin
|
|||||||
#
|
#
|
||||||
# where YAP should look for libraries
|
# where YAP should look for libraries
|
||||||
#
|
#
|
||||||
LIBDIR=$(EROOTDIR)/lib/Yap
|
LIBDIR=@libdir@/Yap
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
CC=@CC@
|
CC=@CC@
|
||||||
|
@ -12,7 +12,7 @@ BINDIR = $(ROOTDIR)/bin
|
|||||||
#
|
#
|
||||||
# where YAP should look for libraries
|
# where YAP should look for libraries
|
||||||
#
|
#
|
||||||
LIBDIR=$(ROOTDIR)/lib/Yap
|
LIBDIR=@libdir@/Yap
|
||||||
#
|
#
|
||||||
# where YAP should look for architecture-independent Prolog libraries
|
# where YAP should look for architecture-independent Prolog libraries
|
||||||
#
|
#
|
||||||
|
@ -17,9 +17,9 @@ EROOTDIR = @exec_prefix@
|
|||||||
srcdir=@srcdir@
|
srcdir=@srcdir@
|
||||||
|
|
||||||
BINDIR = $(EROOTDIR)/bin
|
BINDIR = $(EROOTDIR)/bin
|
||||||
LIBDIR=$(EROOTDIR)/lib
|
LIBDIR=@libdir@
|
||||||
SHAREDIR=$(EROOTDIR)/share/Yap
|
SHAREDIR=$(EROOTDIR)/share/Yap
|
||||||
YAPLIBDIR=$(EROOTDIR)/lib/Yap
|
YAPLIBDIR=@libdir@/Yap
|
||||||
|
|
||||||
PL=@EXTEND_DYNLOADER_PATH@ $(DESTDIR)$(BINDIR)/yap $(DESTDIR)$(YAPLIBDIR)/startup.yss
|
PL=@EXTEND_DYNLOADER_PATH@ $(DESTDIR)$(BINDIR)/yap $(DESTDIR)$(YAPLIBDIR)/startup.yss
|
||||||
LN_S=@LN_S@
|
LN_S=@LN_S@
|
||||||
|
@ -16,8 +16,8 @@ abs_top_builddir = @abs_top_builddir@
|
|||||||
srcdir=@srcdir@
|
srcdir=@srcdir@
|
||||||
|
|
||||||
BINDIR = $(EROOTDIR)/bin
|
BINDIR = $(EROOTDIR)/bin
|
||||||
LIBDIR=$(EROOTDIR)/lib
|
LIBDIR=@libdir@
|
||||||
YAPLIBDIR=$(EROOTDIR)/lib/Yap
|
YAPLIBDIR=@libdir@/Yap
|
||||||
SHAREDIR=$(ROOTDIR)/share/Yap
|
SHAREDIR=$(ROOTDIR)/share/Yap
|
||||||
|
|
||||||
SHELL=@SHELL@
|
SHELL=@SHELL@
|
||||||
|
@ -14,7 +14,7 @@ BINDIR = $(EROOTDIR)/bin
|
|||||||
#
|
#
|
||||||
# where YAP should look for libraries
|
# where YAP should look for libraries
|
||||||
#
|
#
|
||||||
LIBDIR=$(EROOTDIR)/lib/Yap
|
LIBDIR=@libdir@/Yap
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
CC=@CC@
|
CC=@CC@
|
||||||
|
@ -9,7 +9,7 @@ BINDIR = $(ROOTDIR)/bin
|
|||||||
#
|
#
|
||||||
# where YAP should look for binary libraries
|
# where YAP should look for binary libraries
|
||||||
#
|
#
|
||||||
LIBDIR=$(ROOTDIR)/lib/Yap
|
LIBDIR=@libdir@/Yap
|
||||||
#
|
#
|
||||||
# where YAP should look for architecture-independent Prolog libraries
|
# where YAP should look for architecture-independent Prolog libraries
|
||||||
#
|
#
|
||||||
|
Reference in New Issue
Block a user