diff options
| author | heinz <heinz> | 2008-01-03 23:18:07 +0000 |
|---|---|---|
| committer | heinz <heinz> | 2008-01-03 23:18:07 +0000 |
| commit | b518a3fafda5b35ae8d8cb847d5ec4786f8910c6 (patch) | |
| tree | 170b0519d8968570a623ea56286e87d7e7634aec /shells | |
| parent | 2d46c3e557e38efeeca844eb5be573a813dcc65f (diff) | |
| download | pkgsrc-b518a3fafda5b35ae8d8cb847d5ec4786f8910c6.tar.gz | |
Added support for installation to DESTDIR.
Diffstat (limited to 'shells')
| -rw-r--r-- | shells/bash2/Makefile | 7 | ||||
| -rw-r--r-- | shells/tcsh/Makefile | 22 |
2 files changed, 17 insertions, 12 deletions
diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile index 12222b36728..3079e94f8ef 100644 --- a/shells/bash2/Makefile +++ b/shells/bash2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.75 2007/01/18 09:42:14 rillig Exp $ +# $NetBSD: Makefile,v 1.76 2008/01/03 23:18:39 heinz Exp $ # DISTNAME= bash-2.05b @@ -18,6 +18,7 @@ COMMENT= The GNU Bourne Again Shell CONFLICTS= static-bash-[0-9]* +PKG_DESTDIR_SUPPORT= user-destdir PKG_INSTALLATION_TYPES= overwrite pkgviews USE_GNU_READLINE= yes @@ -62,7 +63,7 @@ BUILDLINK_API_DEPENDS.readline+= readline>=4.3 .include "../../devel/readline/buildlink3.mk" post-install: - ${INSTALL_MAN} ${WRKSRC}/doc/bash.1 ${PREFIX}/${PKGMANDIR}/man1 - ${INSTALL_MAN} ${WRKSRC}/doc/bashbug.1 ${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_MAN} ${WRKSRC}/doc/bash.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_MAN} ${WRKSRC}/doc/bashbug.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/shells/tcsh/Makefile b/shells/tcsh/Makefile index 23484518660..0bdd74a72ff 100644 --- a/shells/tcsh/Makefile +++ b/shells/tcsh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2007/04/25 13:21:43 obache Exp $ +# $NetBSD: Makefile,v 1.59 2008/01/03 23:21:41 heinz Exp $ # DISTNAME= tcsh-6.15.00 @@ -11,6 +11,8 @@ MAINTAINER= kim@tac.nyc.ny.us HOMEPAGE= http://www.tcsh.org/Welcome COMMENT= Extended C-shell with many useful features +PKG_DESTDIR_SUPPORT= user-destdir + CONFLICTS?= static-tcsh-[0-9]* GNU_CONFIGURE= yes @@ -29,16 +31,18 @@ LOWER_OPSYS= solaris${OS_VER_cmd:sh} PKG_SHELL?= bin/tcsh +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 + post-install: @${ECHO} "Installing message catalogues" cp ${PKGDIR:Q}/PLIST ${PLIST_SRC:Q} set -e; \ if [ -f ${WRKSRC:Q}/tcsh.C.cat ]; \ then \ - [ -d ${PREFIX:Q}/${NLSDIR:Q}/C ] || \ - ${INSTALL_DATA_DIR} ${PREFIX:Q}/${NLSDIR:Q}/C; \ + [ -d ${DESTDIR}${PREFIX:Q}/${NLSDIR:Q}/C ] || \ + ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX:Q}/${NLSDIR:Q}/C;\ ${INSTALL_DATA} ${WRKSRC:Q}/tcsh.C.cat \ - ${PREFIX}/${NLSDIR:Q}/C/tcsh.cat; \ + ${DESTDIR}${PREFIX}/${NLSDIR:Q}/C/tcsh.cat; \ ${ECHO} ${NLSDIR:Q}/C/tcsh.cat >> ${PLIST_SRC:Q}; \ for i in \ et:ISO_8859-15:et:EE \ @@ -65,16 +69,16 @@ post-install: while [ $$# -gt 0 ]; \ do \ d=${NLSDIR:Q}/$${c}_$$1.$${s}; \ - [ -d ${PREFIX}/$$d ] || \ - ${INSTALL_DATA_DIR} ${PREFIX}/$$d; \ + [ -d ${DESTDIR}${PREFIX}/$$d ] || \ + ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/$$d; \ if [ -z "$$o" ]; \ then \ o="$$d"; \ ${INSTALL_DATA} ${WRKSRC}/tcsh.$${l}.cat \ - ${PREFIX}/$${d}/tcsh.cat; \ + ${DESTDIR}${PREFIX}/$${d}/tcsh.cat; \ else \ - ${LN} -f ${PREFIX}/$${o}/tcsh.cat \ - ${PREFIX}/$${d}; \ + ${LN} -f ${DESTDIR}${PREFIX}/$${o}/tcsh.cat \ + ${DESTDIR}${PREFIX}/$${d}; \ fi; \ ${ECHO} $${d}/tcsh.cat >> ${PLIST_SRC}; \ shift 1; \ |