Add user-destdir installation support.

4 files changed, 19 insertions, 7 deletions

diff --git a/editors/emacs21-nox11/Makefile b/editors/emacs21-nox11/Makefile
index 33c52bab94d..e3c2f506b4c 100644
--- a/editors/emacs21-nox11/Makefile
+++ b/editors/emacs21-nox11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/07/13 18:36:22 dholland Exp $
+# $NetBSD: Makefile,v 1.8 2011/03/21 06:05:44 obache Exp $
 
 PKGNAME=	emacs-nox11-${EMACSVERSION}a
 PKGREVISION=	13
@@ -7,6 +7,8 @@ COMMENT_EXTRA=	: non-X11 version
 
 CONFLICTS+=	emacs-[0-9]*
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../mk/bsd.prefs.mk"
 
 # Forcibly remove any "x11" options.
diff --git a/editors/emacs21/Makefile b/editors/emacs21/Makefile
index edc62c10997..034919441bc 100644
--- a/editors/emacs21/Makefile
+++ b/editors/emacs21/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2011/03/10 10:24:52 obache Exp $
+# $NetBSD: Makefile,v 1.19 2011/03/21 06:05:44 obache Exp $
 
 PKGREVISION=	21
 CATEGORIES=	editors
@@ -6,6 +6,8 @@ COMMENT=	GNU editing macros (editor)
 
 CONFLICTS+=	emacs-nox11-[0-9]*
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=	imake
 
 .include "options.mk"
diff --git a/editors/emacs21/Makefile.common b/editors/emacs21/Makefile.common
index 05fe8442901..670eda135d3 100644
--- a/editors/emacs21/Makefile.common
+++ b/editors/emacs21/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2010/05/05 14:26:36 roy Exp $
+# $NetBSD: Makefile.common,v 1.8 2011/03/21 06:05:44 obache Exp $
 
 DISTNAME=	emacs-${EMACSVERSION}a
 
@@ -28,6 +28,9 @@ CHECK_WRKREF_SKIP+=	bin/emacs
 CHECK_WRKREF_SKIP+=	bin/emacs-${EMACSVERSION}
 
 CONFIGURE_ARGS+=	--srcdir=${WRKSRC:Q}
+INSTALL_MAKE_FLAGS+=	prefix=${DESTDIR}${PREFIX}
+INSTALL_MAKE_FLAGS+=	mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
+INSTALL_MAKE_FLAGS+=	infodir=${DESTDIR}${PREFIX}/${PKGINFODIR}
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -97,5 +100,5 @@ pre-install:
 	@${FIND} ${WRKSRC} -type f -name "*.orig" -print | ${XARGS} ${RM} -f
 
 post-install:
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/emacs
-	${CHMOD} -R go-w ${PREFIX}/share/emacs
+	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${PREFIX}/share/emacs
+	${CHMOD} -R go-w ${DESTDIR}${PREFIX}/share/emacs
diff --git a/editors/leim21/Makefile b/editors/leim21/Makefile
index 7e05c730143..4cd6ea44664 100644
--- a/editors/leim21/Makefile
+++ b/editors/leim21/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/10/11 09:31:56 uebayasi Exp $
+# $NetBSD: Makefile,v 1.8 2011/03/21 06:12:19 obache Exp $
 
 DISTNAME=	leim-${VERSION}
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -11,6 +11,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/emacs/emacs.html
 COMMENT=	Libraries of Emacs Input Methods (for emacs21)
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/emacs-${VERSION}/leim
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	gmake
@@ -24,6 +26,9 @@ CONFIG_SUB_OVERRIDE=	../config.sub
 
 EMACS21_FILESDIR=	${.CURDIR}/../../editors/emacs21/files
 
+INSTALL_MAKE_FLAGS+=	prefix=${DESTDIR}${PREFIX}
+INSTALLATION_DIRS+=	share/emacs/${VERSION}/leim
+
 post-extract:
 	@${ECHO} '#!/bin/sh' >${WRKSRC}/configure
 	@${ECHO} 'cd ..' >>${WRKSRC}/configure
@@ -34,7 +39,7 @@ post-extract:
 .include "../../mk/bsd.prefs.mk"
 
 post-install:
-	@${CHOWN} -R ${ROOT_USER} ${PREFIX}/share/emacs/${VERSION}/leim
+	@${CHOWN} -R ${ROOT_USER} ${DESTDIR}${PREFIX}/share/emacs/${VERSION}/leim
 
 .include "../../editors/emacs/modules.mk"
 .include "../../mk/bsd.pkg.mk"