Fix confilict with scmgit.

Add DESTDIR.
This commit is contained in:
Adam Hoka 2008-03-04 12:46:12 +00:00 committed by Thomas Klausner
parent 2827b68c1c
commit 15731bfa09
3 changed files with 18 additions and 7 deletions

View file

@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.7 2006/07/12 23:18:22 dillo Exp $
# $NetBSD: Makefile,v 1.8 2008/03/04 12:46:12 hoka_adam Exp $
#
DISTNAME= git-110
PKGNAME= git-1.1.0
PKGNAME= glkgit-1.1.0
CATEGORIES= games
MASTER_SITES= http://diden.net/if/git/releases/
EXTRACT_SUFX= .zip
@ -11,10 +11,17 @@ MAINTAINER= dillo@NetBSD.org
HOMEPAGE= http://diden.net/if/git/
COMMENT= Interpreter for Glulx interactive fiction
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV:S/glk//}
MAKE_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR:Q}
PKG_OPTIONS_VAR= PKG_OPTIONS.git
PKG_DESTDIR_SUPPORT+= user-destdir
INSTALLATION_DIRS+= bin
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/git ${DESTDIR}${PREFIX}/bin/glkgit
PKG_OPTIONS_VAR= PKG_OPTIONS.glkgit
.include "../../wip/glkloader/glk-options.mk"
.include "../../mk/bsd.options.mk"
.include "../../wip/glkloader/glk-depends.mk"

View file

@ -1,2 +1,2 @@
@comment $NetBSD: PLIST,v 1.1.1.1 2004/05/23 23:22:32 dillo Exp $
bin/git
@comment $NetBSD: PLIST,v 1.2 2008/03/04 12:46:12 hoka_adam Exp $
bin/glkgit

View file

@ -1 +1,5 @@
Conflicts with misc/git.
Should be imported as glkgit if ready.
Doesn't work on 4.99.55:
Program terminated with signal 11, Segmentation fault.
#0 0xbbb61d97 in _malloc_prefork () from /usr/lib/libc.so.12