use ${GMAKE} instead of ${MAKE}
PLIST
  magit/magit-bisect.el{,c} removed
patches/patch-Makefile
  adjust with upstream change
This commit is contained in:
Makoto Fujiwara 2014-01-24 00:22:27 +00:00 committed by Thomas Klausner
parent 23af9412bf
commit 72d93c8c48
4 changed files with 8 additions and 10 deletions

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.2 2013/11/07 03:07:52 makoto Exp $ # $NetBSD: Makefile,v 1.3 2014/01/24 00:22:27 makoto Exp $
DISTNAME= magit-1.2.0.50 DISTNAME= magit-1.2.0.50
CATEGORIES= devel CATEGORIES= devel
@ -38,7 +38,7 @@ BUILD_TARGET= all
TEST_TARGET= check TEST_TARGET= check
post-patch: post-patch:
(cd ${WRKSRC}; ${MAKE} VERSION=${PKGVERSION} magit-version.el) (cd ${WRKSRC}; ${GMAKE} VERSION=${PKGVERSION} magit-version.el)
.include "../../wip/mk/git-package.mk" .include "../../wip/mk/git-package.mk"
.include "../../wip/git-modes-git/buildlink3.mk" .include "../../wip/git-modes-git/buildlink3.mk"

View file

@ -1,8 +1,6 @@
@comment $NetBSD: PLIST,v 1.2 2013/11/07 03:07:52 makoto Exp $ @comment $NetBSD: PLIST,v 1.3 2014/01/24 00:22:27 makoto Exp $
share/doc/magit/AUTHORS.md share/doc/magit/AUTHORS.md
${EMACS_LISPPREFIX}/magit/magit-autoloads.el ${EMACS_LISPPREFIX}/magit/magit-autoloads.el
${EMACS_LISPPREFIX}/magit/magit-bisect.el
${EMACS_LISPPREFIX}/magit/magit-bisect.elc
${EMACS_LISPPREFIX}/magit/magit-blame.el ${EMACS_LISPPREFIX}/magit/magit-blame.el
${EMACS_LISPPREFIX}/magit/magit-blame.elc ${EMACS_LISPPREFIX}/magit/magit-blame.elc
${EMACS_LISPPREFIX}/magit/magit-key-mode.el ${EMACS_LISPPREFIX}/magit/magit-key-mode.el

View file

@ -1,3 +1,3 @@
$NetBSD: distinfo,v 1.2 2013/11/07 03:07:52 makoto Exp $ $NetBSD: distinfo,v 1.3 2014/01/24 00:22:27 makoto Exp $
SHA1 (patch-Makefile) = 4cb3ca6f6a472cf4ef016310742788b74c18d974 SHA1 (patch-Makefile) = c65c2a677b311bbac56f5db21bd7b239b4c725a2

View file

@ -1,4 +1,4 @@
$NetBSD: patch-Makefile,v 1.1 2013/11/07 03:07:52 makoto Exp $ $NetBSD: patch-Makefile,v 1.2 2014/01/24 00:22:27 makoto Exp $
(1) convert info directory (1) convert info directory
(2) Add ${PREFIX}/share/emacs/site-lisp for magit.el when (2) Add ${PREFIX}/share/emacs/site-lisp for magit.el when
@ -15,9 +15,9 @@ $NetBSD: patch-Makefile,v 1.1 2013/11/07 03:07:52 makoto Exp $
docdir ?= $(datarootdir)/doc/magit docdir ?= $(datarootdir)/doc/magit
execdir ?= $(PREFIX)/bin execdir ?= $(PREFIX)/bin
@@ -28,7 +28,7 @@ INSTALL_INFO ?= install-info @@ -27,7 +27,7 @@ INSTALL_INFO ?= install-info
EFLAGS ?= -L ../git-modes EFLAGS ?= -L ../git-modes -L ../cl-lib
EMACS ?= emacs EMACS ?= emacs
-BATCH = $(EMACS) $(EFLAGS) -batch -Q -L . -BATCH = $(EMACS) $(EFLAGS) -batch -Q -L .
+BATCH = $(EMACS) $(EFLAGS) -batch -Q -L . -L @@BUILDLINK_DIR@@/share/emacs/site-lisp/git-modes +BATCH = $(EMACS) $(EFLAGS) -batch -Q -L . -L @@BUILDLINK_DIR@@/share/emacs/site-lisp/git-modes