Permalink
Browse files

Remove module.lisp.in.

Preserves the lack of runtime dependency on ASDF and the ability to
specify contrib dir as a configure switch.
  • Loading branch information...
1 parent b80ff16 commit 14571fc4b5deec581e1c9be663dbdc7a69db3dc0 @dangerousben committed Mar 21, 2011
Showing with 7 additions and 5 deletions.
  1. +0 −1 .gitignore
  2. +0 −1 configure.ac
  3. +3 −2 make-image.lisp.in
  4. +4 −1 module.lisp.in → module.lisp
View
@@ -14,7 +14,6 @@ stumpwm
stumpwm.info
TAGS
make-image.lisp
-module.lisp
version.lisp
stumpwm-*.tgz
stumpwm-*.tgz.sig
View
@@ -122,4 +122,3 @@ fi
AC_OUTPUT(Makefile)
AC_OUTPUT(make-image.lisp)
AC_OUTPUT(version.lisp)
-AC_OUTPUT(module.lisp)
View
@@ -3,6 +3,7 @@
(require 'asdf #+clisp'("asdf.lisp"))
#+(or clisp ecl) (load "@PPCRE_PATH@/cl-ppcre.asd")
(asdf:oos 'asdf:load-op 'stumpwm)
+#-ecl (stumpwm:set-contrib-dir "@CONTRIB_DIR@")
#+sbcl
(sb-ext:save-lisp-and-die "stumpwm" :toplevel (lambda ()
@@ -26,5 +27,5 @@
:move-here "."
:name-suffix ""
:epilogue-code '(progn
- (funcall (intern "STUMPWM" (find-package "STUMPWM")))
- 0))
+ (stumpwm:set-contrib-dir "@CONTRIB_DIR@")
+ (stumpwm:stumpwm)))
@@ -36,7 +36,10 @@
(setf dir (concat dir "/")))
(pathname dir))
-(defvar *contrib-dir* (module-string-as-directory "@CONTRIB_DIR@")
+(defvar *contrib-dir*
+ #.(asdf:system-relative-pathname (asdf:find-system :stumpwm)
+ (make-pathname :directory
+ '(:relative "contrib")))
"The location of the contrib modules on your system.")
(defcommand set-contrib-dir (dir) ((:string "Directory: "))

0 comments on commit 14571fc

Please sign in to comment.