X-Git-Url: http://git.kpe.io/?p=lml2.git;a=blobdiff_plain;f=files.lisp;h=445e5487c63b15e948d338b2dd2ba210ed4b6675;hp=7efb4e64a72db0bd2bcc4571817201c72d1c851c;hb=710507af21b320d11151423b73b73f1d3fdfebee;hpb=be1b61b9a1a19ea618b9cd854d6539957c4efd57

diff --git a/files.lisp b/files.lisp
index 7efb4e6..445e548 100644
--- a/files.lisp
+++ b/files.lisp
@@ -29,11 +29,13 @@
       (unless (position #\. f)
 	(setq f (concatenate 'string f ".html"))))
     (if *sources-dir*
-	(make-pathname :defaults (ecase type
-				   (:source *sources-dir*)
-				   (:output *output-dir*))
-		       :name `,(pathname-name f)
-		       :type `,(pathname-type f))
+	(merge-pathnames
+	 (make-pathname :name `,(pathname-name f)
+			:type `,(pathname-type f)
+			:directory `,(pathname-directory f))
+	 (ecase type
+	   (:source *sources-dir*)
+	   (:output *output-dir*)))
       (if (stringp f)
 	  (parse-namestring f)
 	f))))
@@ -74,5 +76,5 @@
 (defun lml-load (file)
   (lml-load-path (eval `(lml-file-name ,file :source))))
 
-(defun include-file (file)
+(defun insert-file (file)
   (print-file-contents file *html-stream*))