From 0238bdb00116c7fce43dd982ba69c1d6ef9ebc42 Mon Sep 17 00:00:00 2001 From: Jose Antonio Ortega Ruiz Date: Thu, 19 Sep 2013 02:37:06 +0200 Subject: Paving the way to MELPA (and simpler ELPA generation) Following the discussion in GitHub, i'm adding an alternative scheme path to geiser.el as well as ##autoload cookies. As a first benefit, this simplifies a bit the elpa target, after playing a similar path trick in bin/geiser-racket.sh. Things should be almost ready for creating a MELPA recipe. --- Makefile.am | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index ebc41a4..38be6b2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,6 +9,8 @@ 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 +bin_dir = $(elpa_dir)/bin +scheme_dir = $(elpa_dir)/scheme elpa: README.elpa info rm -rf $(elpa_dir) @@ -20,27 +22,21 @@ elpa: README.elpa info $(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 + $(mkdir_p) $(scheme_dir)/guile/geiser + $(mkdir_p) $(scheme_dir)/racket/geiser $(INSTALL_DATA) $(abs_top_srcdir)/scheme/guile/geiser/* \ - $(elpa_dir)/guile/geiser + $(scheme_dir)/guile/geiser $(INSTALL_DATA) $(abs_top_srcdir)/scheme/racket/geiser/* \ - $(elpa_dir)/racket/geiser + $(scheme_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 $(elpa_dir)/README - $(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 + $(mkdir_p) $(bin_dir) + $(INSTALL) $(top_srcdir)/bin/geiser-racket.sh $(bin_dir) rm -f $(elpa_name).tar tar cf $(elpa_name).tar $(elpa_name) - -- cgit v1.2.3