From 64319f622f082bb163a869a12df0ace35e33ea12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADtor=20Santos=20Costa?= Date: Mon, 13 Feb 2012 09:41:22 +0000 Subject: [PATCH] better SWI support. --- packages/Dialect.defs.in | 7 ++++--- packages/Makefile.defs.in | 8 +++++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/packages/Dialect.defs.in b/packages/Dialect.defs.in index bc3aff68a..4fed10632 100644 --- a/packages/Dialect.defs.in +++ b/packages/Dialect.defs.in @@ -24,7 +24,8 @@ PLINCL=$(PLBASE)/include PLLIBDIR=$(PLBASE)/share/Yap SOLIBDIR=$(PLBASE)/lib/Yap PKGDOCDIR=$(PLBASE)/share/doc/Yap/packages -PKGEXDIR=$(PLBASE)/share/doc/Yap//packages/examples +PKGEXDIR=$(PLBASE)/share/doc/Yap/packages/examples +XPCEBASE=$(PLBASE)/xpce # # YAP internal stuff @@ -53,11 +54,11 @@ LDFLAGS=$(PKGLDFLAGS) MKINDEX=(cd $(srcdir) ; $(PL) -f none -g make -t halt) .txt.tex: - swipl -f script.pl -g "doc_latex('$*.txt','$*.tex',[stand_alone(false)]),halt" -t "halt(1)" + $(PUBLICPL) -L $(SHAREDIR)/doc_latex -g "doc_latex('$*.txt','$*.tex',[stand_alone(false)]),halt" -t "halt(1)" PUBLICPL=$(PL) -PLTOTEX=$(PUBLICPL) -q -l $(srcdir)/pltotex.pl -g pltotex -- +PLTOTEX=$(PUBLICPL) -q -l $(srcdir)/pltotex -g pltotex -- # # find out how to generate .o files from $(scrdir) diff --git a/packages/Makefile.defs.in b/packages/Makefile.defs.in index 59972c2c7..c5182db88 100644 --- a/packages/Makefile.defs.in +++ b/packages/Makefile.defs.in @@ -57,12 +57,18 @@ $(PDF): $(TEX) $(DOC2TEX) $< > $@ %.tex : $(srcdir)/%.txt - $(PUBLICPL) -f none -g "doc_latex('$<','$@',[stand_alone(false)]),halt" -t "halt(1)" + $(PUBLICPL) -f $(PLLIBDIR)/doc_latex -g "doc_latex('$<','$@',[stand_alone(false)]),halt" -t "halt(1)" %.tex : $(srcdir)/%.pl $(PLTOTEX) $< > $@ # Get the Prolog dialect specific part of the Makefiles +LIBSRCPL=$(addprefix $(srcdir)/, $(LIBPL)) + +LIBSRCALL=$(addprefix $(srcdir)/, $(LIBALL)) + +SRCXPCEPL=$(addprefix $(srcdir)/, $(XPCEPL)) + include ../Dialect.defs