New make target, elpa, to create ELPA target

A bunch of shellish ops, but seems to be working fine.

2 files changed, 39 insertions, 18 deletions

diff --git a/Makefile.am b/Makefile.am
index 4f5a16b..ab2ec90 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,3 +4,42 @@ EXTRA_DIST = THANKS
 
 dist-hook:
 	$(SHELL) $(top_srcdir)/ChangeLog > $(top_distdir)/ChangeLog
+
+elpa_name = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
+elpa_dir = $(abs_top_builddir)/$(elpa_name)
+elpa_slogan = "GNU Emacs and Scheme talk to each other"
+geiser_el = $(elpa_dir)/geiser.el
+
+elpa: info
+	rm -rf $(elpa_dir)
+	$(mkdir_p) $(elpa_dir)
+
+	echo '(define-package "geiser" "$(PACKAGE_VERSION)" $(elpa_slogan))' \
+             > $(elpa_dir)/geiser-pkg.el
+
+	$(INSTALL_DATA) $(abs_top_srcdir)/elisp/*.el \
+                        $(top_builddir)/elisp/geiser-version.el \
+                        $(elpa_dir)
+	sed -i -e 's|(expand-file-name "../scheme/" .*$$|geiser-elisp-dir|' \
+                  $(geiser_el)
+	sed -i -e 's/(autoload /;;;###autoload\n(autoload /' $(geiser_el)
+
+	$(mkdir_p) $(elpa_dir)/guile/geiser
+	$(mkdir_p) $(elpa_dir)/racket/geiser
+	$(INSTALL_DATA) $(abs_top_srcdir)/scheme/guile/geiser/* \
+                        $(elpa_dir)/guile/geiser
+	$(INSTALL_DATA) $(abs_top_srcdir)/scheme/racket/geiser/* \
+                        $(elpa_dir)/racket/geiser
+
+	$(INSTALL_DATA) $(srcdir)/doc/geiser.info $(elpa_dir)
+	(cd $(elpa_dir) && install-info --dir=dir geiser.info 2>/dev/null)
+
+	$(INSTALL_DATA) $(top_srcdir)/README $(elpa_dir)
+
+	$(mkdir_p) $(elpa_dir)/bin
+	$(INSTALL) $(top_srcdir)/bin/geiser-racket.sh $(elpa_dir)/bin/geiser-racket
+	sed -i -e  's|^top=.*$$|top=$$(dirname $$0)/..|' \
+                   $(elpa_dir)/bin/geiser-racket
+
+	rm -f $(elpa_name).tar
+	tar cf $(elpa_name).tar $(elpa_name)
diff --git a/elisp/geiser.el b/elisp/geiser.el
index 7cf8349..fbc34a6 100644
--- a/elisp/geiser.el
+++ b/elisp/geiser.el
@@ -24,68 +24,50 @@
 
 ;;; Autoloads:
 
-;;;###autoload
 (autoload 'geiser-version "geiser-version" "Echo Geiser's version." t)
 
-;;;###autoload
 (autoload 'geiser-unload "geiser-reload" "Unload all Geiser code." t)
 
-;;;###autoload
 (autoload 'geiser-reload "geiser-reload" "Reload Geiser code." t)
 
-;;;###autoload
 (autoload 'geiser "geiser-repl"
   "Start a Geiser REPL, or switch to a running one." t)
 
-;;;###autoload
 (autoload 'run-geiser "geiser-repl" "Start a Geiser REPL." t)
 
-;;;###autoload
 (autoload 'geiser-connect "geiser-repl"
   "Start a Geiser REPL connected to a remote server." t)
 
-;;;###autoload
 (autoload 'switch-to-geiser "geiser-repl"
   "Switch to a running one Geiser REPL." t)
 
-;;;###autoload
 (autoload 'run-guile "geiser-guile" "Start a Geiser Guile REPL." t)
 
-;;;###autoload
 (autoload 'switch-to-guile "geiser-guile"
   "Start a Geiser Guile REPL, or switch to a running one." t)
 
-;;;###autoload
 (autoload 'connect-to-guile "geiser-guile"
   "Connect to a remote Geiser Guile REPL." t)
 
-;;;###autoload
 (autoload 'run-racket "geiser-racket" "Start a Geiser Racket REPL." t)
 
-;;;###autoload
 (autoload 'run-gracket "geiser-racket" "Start a Geiser GRacket REPL." t)
 
-;;;###autoload
 (autoload 'switch-to-racket "geiser-racket"
   "Start a Geiser Racket REPL, or switch to a running one." t)
 
-;;;###autoload
 (autoload 'connect-to-racket "geiser-racket"
   "Connect to a remote Geiser Racket REPL." t)
 
-;;;###autoload
 (autoload 'geiser-mode "geiser-mode"
   "Minor mode adding Geiser REPL interaction to Scheme buffers." t)
 
-;;;###autoload
 (autoload 'turn-on-geiser-mode "geiser-mode"
   "Enable Geiser's mode (useful in Scheme buffers)." t)
 
-;;;###autoload
 (autoload 'turn-off-geiser-mode "geiser-mode"
   "Disable Geiser's mode (useful in Scheme buffers)." t)
 
-;;;###autoload
 (autoload 'geiser-mode--maybe-activate "geiser-mode")
 
 ;;;###autoload