diff options
| author | Jonas Bernoulli <jonas@bernoul.li> | 2015-06-29 19:09:15 +0200 |
|---|---|---|
| committer | Jonas Bernoulli <jonas@bernoul.li> | 2015-06-29 19:09:47 +0200 |
| commit | 331cbc2ccb844b40d9be6bf00114df483c03a1b4 (patch) | |
| tree | c068bbaa9806a8c860ba322f33d40ffdf62f9039 | |
| parent | ed7059cd7849a98a576dc64f37c8a547cb4e3e3c (diff) | |
fix elpa make targets
| -rw-r--r-- | Makefile | 21 | ||||
| -rw-r--r-- | default.mk | 3 |
2 files changed, 11 insertions, 13 deletions
@@ -142,8 +142,8 @@ elpa: $(ELPA_ARCHIVES) define with_editor_pkg (define-package "with-editor" "$(VERSION)" "Use the Emacsclient as $$EDITOR" - '((emacs \"24.4\") - (dash \"2.10.0\"))) + '((emacs "24.4") + (dash "2.10.0"))) endef # ' export with_editor_pkg @@ -160,13 +160,12 @@ with-editor-$(VERSION).tar: info git-commit-$(VERSION).el.gz: @printf "Packing $@\n" @$(CP) lisp/git-commit.el git-commit-$(VERSION).el - @$(GZIP) git-commit-$(VERSION).el define magit_popup_pkg (define-package "magit-popup" "$(VERSION)" "Define prefix-infix-suffix command combos" - '((emacs \"24.4\") - (dash \"2.10.0\"))) + '((emacs "24.4") + (dash "2.10.0"))) endef # ' export magit_popup_pkg @@ -180,18 +179,18 @@ magit-popup-$(VERSION).tar: info -f magit-popup-$(VERSION).tar magit-popup-$(VERSION) @$(RMDIR) magit-popup-$(VERSION) -ELPA_ROOT_FILES = COPYING README.md +ELPA_ROOT_FILES = COPYING ELPA_LISP_FILES = $(addprefix lisp/,$(ELMS) magit-version.el) ELPA_DOCS_FILES = $(addprefix Documentation/,AUTHORS.md dir magit.info) define magit_pkg (define-package "magit" "$(VERSION)" "A Git porcelain inside Emacs" - '((emacs \"24.4\") - (dash \"2.10.0\") - (with-editor \"2.0.50\") - (git-commit \"2.0.50\") - (magit-popup \"2.0.50\"))) + '((emacs "24.4") + (dash "2.10.0") + (with-editor "2.0.50") + (git-commit "2.0.50") + (magit-popup "2.0.50"))) endef # ' export magit_pkg @@ -11,7 +11,6 @@ CP ?= install -p -m 644 MKDIR ?= install -p -m 755 -d RMDIR ?= rm -rf TAR ?= tar -GZIP ?= gzip PACKAGES = with-editor git-commit magit-popup magit PACKAGE_VERSIONS = $(addsuffix -$(VERSION),$(PACKAGES)) @@ -43,7 +42,7 @@ ELS += magit-ediff.el ELS += magit-extras.el ELS += git-rebase.el ELCS = $(ELS:.el=.elc) -ELMS = $(filter-out $(addsuffix .el,$(PACKAGES)),$(ELS)) +ELMS = magit.el $(filter-out $(addsuffix .el,$(PACKAGES)),$(ELS)) ELGS = magit-autoloads.el magit-version.el EMACSBIN ?= emacs |