[STUMP] [PATCH] Remove module.lisp.in.

[Ben Spencer]

Preserves the lack of runtime dependency on ASDF and the ability to
specify contrib dir as a configure switch.
---
 .gitignore                    |    1 -
 configure.ac                  |    1 -
 make-image.lisp.in            |    5 +++--
 module.lisp.in => module.lisp |    5 ++++-
 4 files changed, 7 insertions(+), 5 deletions(-)
 rename module.lisp.in => module.lisp (91%)

diff --git a/.gitignore b/.gitignore
index 73600d7..f42aceb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,7 +14,6 @@ stumpwm
 stumpwm.info
 TAGS
 make-image.lisp
-module.lisp
 version.lisp
 stumpwm-*.tgz
 stumpwm-*.tgz.sig
diff --git a/configure.ac b/configure.ac
index aef8485..5c65917 100644
--- a/configure.ac
+++ b/configure.ac
@@ -122,4 +122,3 @@ fi
 AC_OUTPUT(Makefile)
 AC_OUTPUT(make-image.lisp)
 AC_OUTPUT(version.lisp)
-AC_OUTPUT(module.lisp)
\ No newline at end of file
diff --git a/make-image.lisp.in b/make-image.lisp.in
index 7caac2c..cbba593 100644
--- a/make-image.lisp.in
+++ b/make-image.lisp.in
@@ -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)))
diff --git a/module.lisp.in b/module.lisp
similarity index 91%
rename from module.lisp.in
rename to module.lisp
index 3c24d5f..94388de 100644
--- a/module.lisp.in
+++ b/module.lisp
@@ -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: "))
-- 
1.7.4.1