--- ./Makefile.orig	2012-09-24 19:41:19.000000000 +0000
+++ ./Makefile	2014-07-01 17:24:01.000000000 +0000
@@ -1,5 +1,5 @@
 VERSION=1.2.0
-EMACS=emacs
+#EMACS=emacs
 PREFIX=/usr/local
 SYSCONFDIR=/etc
 ELS=magit.el magit-svn.el magit-topgit.el magit-stgit.el magit-key-mode.el magit-bisect.el magit-wip.el rebase-mode.el magit-blame.el
@@ -40,7 +40,7 @@
 magit.elc: magit.el
 
 dir: magit.info
-	install-info --dir=$@ $<
+	touch $@
 
 magit.info:
 
@@ -64,15 +64,12 @@
 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
-	mkdir -p $(DESTDIR)$(SYSCONFDIR)/emacs/site-start.d
-	install -m 644 50magit.el $(DESTDIR)$(SYSCONFDIR)/emacs/site-start.d/50magit.el
+	mkdir -p $(ELISPDIR)
+	install -m 644 $(ELS) $(ELCS) $(ELISPDIR)
 
 install_docs: docs
-	mkdir -p $(DESTDIR)$(PREFIX)/share/info
-	install -m 644 magit.info $(DESTDIR)$(PREFIX)/share/info
-	install-info --info-dir=$(DESTDIR)$(PREFIX)/share/info $(DESTDIR)$(PREFIX)/share/info/magit.info
+	mkdir -p $(INFODIR)
+	install -m 644 magit.info $(INFODIR)
 
 install_contrib: contrib
 	mkdir -p $(DESTDIR)$(PREFIX)/share/emacs/site-lisp