Merge remote branch 'refs/remotes/lindi/simple-build-system' into simple-build-system

.gitignore

@@ -1,5 +1,4 @@
 /INSTALL
-/Makefile
 /Makefile.in
 /aclocal.m4
 /build-stamp

Makefile

@@ -0,0 +1,20 @@
+VERSION=0.8.2
+PREFIX=/usr
+
+build:
+	sed -e s/@VERSION@/$(VERSION)/ < magit-pkg.el.in > magit-pkg.el
+	sed -e s/@VERSION@/$(VERSION)/ < magit.spec.in > magit.spec
+	emacs --batch --eval '(byte-compile-file "magit.el")'
+	makeinfo -I . -o magit.info magit.texi
+
+install: build
+	mkdir -p $(DESTDIR)/$(PREFIX)/share/emacs/site-lisp
+	install -m 644 magit.el magit.elc $(DESTDIR)/$(PREFIX)/share/emacs/site-lisp
+	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 $(DESTDIR)/etc/emacs/site-start.d
+	install -m 644 50magit.el $(DESTDIR)/etc/emacs/site-start.d/50magit.el
+
+clean:
+	rm -f magit-pkg.el magit.spec magit.elc magit.info

Makefile.am

@@ -1,25 +0,0 @@
-lispdir = $(datadir)/emacs/site-lisp
-sitestartdir = @SITESTART@
-
-lisp_DATA = magit.el magit.elc magit-svn.el magit-svn.elc magit-topgit.el magit-topgit.elc
-sitestart_DATA = 50magit.el
-
-info_TEXINFOS = magit.texi
-
-CLEANFILES = magit-*.elc
-EXTRA_DIST = magit.el 50magit.el magit.spec magit-svn.el magit-topgit.el
-
-%.elc: %.el
-	@if [ $(builddir) != $(srcdir) ]; then ln $(srcdir)/$*.el .; fi
-	emacs --batch --eval "(add-to-list 'load-path \"$(srcdir)\")" \
-	              --eval '(byte-compile-file "$*.el")'
-	@if [ $(builddir) != $(srcdir) ]; then rm -f $*.el; fi
-
-
-elpa: magit-pkg.el info
-	-@rm -rf magit-$(VERSION)
-	mkdir magit-$(VERSION)
-	cp magit.el magit-pkg.el magit.info magit-$(VERSION)
-	(cd magit-$(VERSION); ginstall-info --dir-file=dir magit.info)
-	tar cf magit-$(VERSION).tar magit-$(VERSION)
-	@rm -rf magit-$(VERSION)

autogen.sh

@@ -1,2 +0,0 @@
-#! /bin/sh
-autoreconf --install

configure.ac

@@ -1,15 +0,0 @@
-AC_INIT(magit, 0.8.2)
-AC_CONFIG_SRCDIR([magit.el])
-AM_INIT_AUTOMAKE([1.10])
-
-AC_ARG_WITH([site-start],
-	AS_HELP_STRING([--with-site-start], [Provide the emacs site-start directory.  The default is $(sysconfdir)/emacs/site-start.el.]),
-	[ SITESTART="$withval" ],
-	[ SITESTART='$(sysconfdir)/emacs/site-start.d' ])
-
-AC_SUBST([SITESTART])
-AC_CONFIG_FILES([Makefile 
-	         magit-pkg.el
-		 magit.spec])
-
-AC_OUTPUT