Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Name the ELisp install directory.

  • Loading branch information...
commit bbec4fcb924436208100588262fa25dec8e5af48 1 parent 4571232
Jesse Alama authored
Showing with 6 additions and 5 deletions.
  1. +6 −5 Makefile
11 Makefile
View
@@ -9,6 +9,7 @@ ELCS_CONTRIB=$(ELS_CONTRIB:.el=.elc)
DIST_FILES=$(ELS) Makefile magit.texi magit.info README.md magit.spec.in magit-pkg.el.in
DIST_FILES_CONTRIB=$(ELS_CONTRIB) contrib/magit
ELPA_FILES=$(ELS) magit.info dir magit-pkg.el
+ELISP_INSTALL_DIR=$(DESTDIR)$(PREFIX)/share/emacs/site-lisp
.PHONY=install
@@ -72,9 +73,9 @@ magit-$(VERSION).tar: $(ELPA_FILES)
install: install_core install_docs
install_core: core
- mkdir -p $(DESTDIR)$(PREFIX)/share/emacs/site-lisp
- install -m 644 $(ELS) $(ELCS) $(DESTDIR)$(PREFIX)/share/emacs/site-lisp
- sed -i -e "s/@GIT_DEV_VERSION@/$(VERSION)/" $(DESTDIR)$(PREFIX)/share/emacs/site-lisp/magit.el #NO_DIST
+ mkdir -p $(ELISP_INSTALL_DIR)
+ install -m 644 $(ELS) $(ELCS) $(ELISP_INSTALL_DIR)
+ sed -i -e "s/@GIT_DEV_VERSION@/$(VERSION)/" $(ELISP_INSTALL_DIR)/magit.el #NO_DIST
mkdir -p $(DESTDIR)$(SYSCONFDIR)/emacs/site-start.d
install -m 644 50magit.el $(DESTDIR)$(SYSCONFDIR)/emacs/site-start.d/50magit.el
@@ -84,8 +85,8 @@ install_docs: docs
install-info --info-dir=$(DESTDIR)$(PREFIX)/share/info $(DESTDIR)$(PREFIX)/share/info/magit.info
install_contrib: contrib
- mkdir -p $(DESTDIR)$(PREFIX)/share/emacs/site-lisp
- install -m 644 $(ELS_CONTRIB) $(ELCS_CONTRIB) $(DESTDIR)$(PREFIX)/share/emacs/site-lisp
+ mkdir -p $(ELISP_INSTALL_DIR)
+ install -m 644 $(ELS_CONTRIB) $(ELCS_CONTRIB) $(ELISP_INSTALL_DIR)
mkdir -p $(DESTDIR)$(PREFIX)/bin
install -m 755 contrib/magit $(DESTDIR)$(PREFIX)/bin
Please sign in to comment.
Something went wrong with that request. Please try again.