Fix Makefile bug. More package tweak. Don't redefine ensure-directory-pathname.

diff --git a/Makefile b/Makefile
index ba1eb79..24f09d6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,7 @@ install-with-xcvb:
                --workspace ${XCVB_WORKSPACE} \
                --object-cache ${XCVB_OBJECT_CACHE}
        make -C ${XCVB_WORKSPACE} -f xcvb.mk -j || \
-               XCVB_DEBUGGING=t make -f xcvb.mk
+               XCVB_DEBUGGING=t make -C ${XCVB_WORKSPACE} -f xcvb.mk
        cl-launch --image ${XCVB_OBJECT_CACHE}/fare.tunes.org/exscribe.image \
                --restart exscribe::main \
                --output ${INSTALL_BIN}/exscribe \

diff --git a/packages.lisp b/packages.lisp
index 9d6ba78..a0b046e 100644 (file)
--- a/packages.lisp
+++ b/packages.lisp
@@ -125,11 +125,12 @@ not to actually implement deep Scheme semantics.")
   (:documentation "HTML backend for exscribe")
   (:shadowing-import-from :exscribe-data #:html)
   (:use :exscribe-data :exscribe :fare-utils :fare-matcher :alexandria
-       :html-dumper :common-lisp)
+       :html-dumper :common-lisp :asdf)
+  (:shadowing-import-from :asdf
+   #:appendf #:ends-with #:featurep) ;; also in alexandria
   (:shadowing-import-from :fare-matcher
    #:of-type)) ;; also in alexandria
 
-
 (defpackage :exscribe-txt
   (:documentation "Text backend for exscribe")
   (:use :exscribe-data :exscribe :fare-utils :fare-matcher :alexandria :common-lisp)
@@ -149,5 +150,7 @@ not to actually implement deep Scheme semantics.")
 (defpackage :exscribe-user
   ;(:shadowing-import-from :scheme-makeup :map)
   (:use :exscribe-html :exscribe-data :exscribe :fare-matcher
-       :fare-utils :scheme-makeup :common-lisp :alexandria)
+       :fare-utils :scheme-makeup :common-lisp :alexandria :asdf)
+  (:shadowing-import-from :asdf
+   #:appendf #:ends-with #:featurep) ;; also in alexandria
   (:shadowing-import-from :fare-matcher #:of-type)) ;; also in alexandria

diff --git a/specials.lisp b/specials.lisp
index 3f740c0..d5a76e6 100644 (file)
--- a/specials.lisp
+++ b/specials.lisp
@@ -9,13 +9,8 @@
 
 (defvar *exscribe-initialized* nil "has exscribe already been initialized?")
 
-(defun ensure-directory-pathname (d)
-  (typecase d
-    (string (parse-namestring (concatenate 'string d "/")))
-    (pathname (make-pathname :name nil :type nil :version nil :defaults d))))
-
 (defvar *exscribe-directory*
-  (ensure-directory-pathname
+  (pathname-directory-pathname
    (or #.(or *compile-file-pathname* *load-pathname*)
        *compile-file-pathname* *load-pathname*)))