Use sweep.pl from the ELPA package rather than from SWI-Prolog

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 303b2d05d342fa1e8ce73e01c4a257ebb1620458..fa4e669faee4c7104e9c1f160204bd62715006e4 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,8 +16,7 @@ if(EMACS_INCLUDE_DIR)
   swipl_plugin(
     sweep-module
     C_SOURCES sweep.c
-    C_INCLUDE_DIR ${EMACS_INCLUDE_DIR}
-    PL_LIBS sweep.pl)
+    C_INCLUDE_DIR ${EMACS_INCLUDE_DIR})
 
   pkg_doc(
     sweep

diff --git a/README.org b/README.org
index 9f0031af1303d3568eb01f49465e6f1649e505d0..98519a6c8e3f482397d0f21212c9632512b2a746 100644 (file)
--- a/README.org
+++ b/README.org
@@ -1024,8 +1024,8 @@ Changes in the Elisp library =sweeprolog.el= do not require rebuilding
 SWI-Prolog, and can be applied and tested directly inside Emacs (see [[info:emacs#Lisp
 Eval][Evaluating Elisp in the Emacs manual]]).
 
-Most often rebuilding SWI-Prolog after changing =sweep.c= and/or
-=sweep.pl= can be achieved with the following command executed in
+Most often rebuilding SWI-Prolog after changing =sweep.c= can be
+achieved with the following command executed in
 =swipl-devel/packages/sweep=:
 
 #+begin_src sh

diff --git a/sweeprolog.el b/sweeprolog.el
index 72501afdc8fbbf09aa6ef16b29d8de5098fbd4f8..6f071f1a99740bf50b4b9f020d436873a1a98d8e 100644 (file)
--- a/sweeprolog.el
+++ b/sweeprolog.el
@@ -150,10 +150,11 @@ inserted to the input history in `sweeprolog-top-level-mode' buffers."
 
 (defcustom sweeprolog-init-args (list "-q"
                                       "--no-signals"
-                                      "-g"
-                                      "[library(sweep)]")
+                                      (expand-file-name
+                                       "sweep.pl"
+                                       (file-name-directory load-file-name)))
   "List of strings used as initialization arguments for Prolog."
-  :package-version '((sweeprolog "0.3.1"))
+  :package-version '((sweeprolog "0.5.2"))
   :type '(repeat string)
   :group 'sweeprolog)