Build system updated.

This commit is contained in:
Phil Jackson 2010-07-11 18:54:03 +01:00
parent 07dbd67495
commit 761d6ad09b
2 changed files with 9 additions and 7 deletions

View file

@ -1,17 +1,18 @@
lispdir = $(datadir)/emacs/site-lisp lispdir = $(datadir)/emacs/site-lisp
sitestartdir = @SITESTART@ sitestartdir = @SITESTART@
lisp_DATA = magit.el magit.elc lisp_DATA = magit.el magit.elc magit-svn.el magit-svn.elc magit-topgit.el magit-topgit.elc
sitestart_DATA = 50magit.el sitestart_DATA = 50magit.el
info_TEXINFOS = magit.texi info_TEXINFOS = magit.texi
CLEANFILES = magit.elc CLEANFILES = magit-*.elc
EXTRA_DIST = magit.el 50magit.el magit.spec EXTRA_DIST = magit.el 50magit.el magit.spec magit-svn.el magit-topgit.el
%.elc: %.el %.elc: %.el
@if [ $(builddir) != $(srcdir) ]; then ln $(srcdir)/$*.el .; fi @if [ $(builddir) != $(srcdir) ]; then ln $(srcdir)/$*.el .; fi
emacs --batch --eval '(byte-compile-file "$*.el")' emacs --batch --eval "(add-to-list 'load-path \"$(srcdir)\")" \
--eval '(byte-compile-file "$*.el")'
@if [ $(builddir) != $(srcdir) ]; then rm -f $*.el; fi @if [ $(builddir) != $(srcdir) ]; then rm -f $*.el; fi

View file

@ -359,6 +359,10 @@ Many Magit faces inherit from this one by default."
(make-variable-buffer-local 'magit-submode) (make-variable-buffer-local 'magit-submode)
(put 'magit-submode 'permanent-local t) (put 'magit-submode 'permanent-local t)
(eval-when-compile
(defun magit-dynamic-clauses-helper (clauses context)
`(((magit-dynamic-clauses ,clauses ,context) t))))
(defun magit-use-region-p () (defun magit-use-region-p ()
(if (fboundp 'use-region-p) (if (fboundp 'use-region-p)
(use-region-p) (use-region-p)
@ -1274,9 +1278,6 @@ TITLE is the displayed title of the section."
`((magit-prefix-p ',prefix ,context) `((magit-prefix-p ',prefix ,context)
,@body)))) ,@body))))
(defun magit-dynamic-clauses-helper (clauses context)
`(((magit-dynamic-clauses ,clauses ,context) t)))
(defun magit-dynamic-clauses (clauses context) (defun magit-dynamic-clauses (clauses context)
(let* ((c (car clauses)) (let* ((c (car clauses))
(prefix (reverse (car c))) (prefix (reverse (car c)))