X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=files.lisp;h=bdf4e96ca1481193fc621f30940f478e106f6173;hb=859b1e7b0f6e92f3a555b79289ce806106a72804;hp=fd2366b3ff30961f8174128324b6541a2b7272d8;hpb=7c195b8519f680bcb64b02645e4110cb7082d914;p=lml.git

diff --git a/files.lisp b/files.lisp
index fd2366b..bdf4e96 100644
--- a/files.lisp
+++ b/files.lisp
@@ -43,14 +43,20 @@
 	  (parse-namestring f)
 	f))))
 
-(defmacro with-dir ((output-dir &key sources) &body body)
-  (when (stringp output-dir)
-    (setq output-dir (parse-namestring output-dir)))
-  (unless sources
-    (setq sources output-dir))
-  `(let ((*output-dir* ,output-dir)
-	 (*sources-dir* ,sources))
-     ,@body))
+(defmacro with-dir ((output &key sources) &body body)
+  (let ((output-dir (gensym))
+	(sources-dir (gensym)))
+  `(let ((,output-dir ,output)
+	 (,sources-dir ,sources))
+    (when (stringp ,output-dir)
+      (setq ,output-dir (parse-namestring ,output-dir)))
+    (when (stringp ,sources-dir)
+      (setq ,sources-dir (parse-namestring ,sources-dir)))
+    (unless ,sources-dir
+      (setq ,sources-dir ,output-dir))
+    (let ((*output-dir* ,output-dir)
+	  (*sources-dir* ,sources-dir))
+      ,@body))))
 
 (defun lml-load-path (file)
   (if (probe-file file)