Permalink
Browse files

Merge remote branch 'upstream/master'

Conflicts:
	magit.el
  • Loading branch information...
2 parents 12738df + cb458d5 commit ef91af2ec3395a56197df8920428ad957aec41e8 @nelhage committed Aug 22, 2010
Showing with 1,261 additions and 318 deletions.
  1. +1 −0 .gitignore
  2. +2 −2 Makefile.am
  3. +9 −2 configure.ac
  4. +1,159 −312 magit.el
  5. +44 −0 magit.spec.in
  6. +46 −2 magit.texi
View
@@ -35,3 +35,4 @@
/magit.pdf
/magit.ps
/magit-pkg.el
+magit.spec
View
@@ -1,13 +1,13 @@
lispdir = $(datadir)/emacs/site-lisp
-sitestartdir = $(sysconfdir)/emacs/site-start.d
+sitestartdir = @SITESTART@
lisp_DATA = magit.el magit.elc
sitestart_DATA = 50magit.el
info_TEXINFOS = magit.texi
CLEANFILES = magit.elc
-EXTRA_DIST = magit.el 50magit.el
+EXTRA_DIST = magit.el 50magit.el magit.spec
%.elc: %.el
@if [ $(builddir) != $(srcdir) ]; then ln $(srcdir)/$*.el .; fi
View
@@ -1,8 +1,15 @@
AC_INIT(magit, 0.8)
AC_CONFIG_SRCDIR([magit.el])
-AM_INIT_AUTOMAKE
+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-pkg.el
+ magit.spec])
AC_OUTPUT
Oops, something went wrong.

0 comments on commit ef91af2

Please sign in to comment.