diff options
| author | seb <seb@pkgsrc.org> | 2003-08-05 13:37:51 +0000 |
|---|---|---|
| committer | seb <seb@pkgsrc.org> | 2003-08-05 13:37:51 +0000 |
| commit | 29aeeba7a6e7ecd3632d3cd6e221a2eda5485ad6 (patch) | |
| tree | dfbd0b5a398984b1c4717069734daa81f3c626f0 /shells/zsh | |
| parent | 25e4c5117346450bf9f1d87c367a7a9bd1d66d60 (diff) | |
| download | pkgsrc-29aeeba7a6e7ecd3632d3cd6e221a2eda5485ad6.tar.gz | |
Convert to USE_NEW_TEXINFO.
Use INSTALL_TARGET to install info files: this gives a proper
environment for USE_NEW_TEXINFO framework to work.
Fix makeinfo invocation for zsh-current via patch file so that
only _one_ info file is generated as PLIST seems to want it.
Diffstat (limited to 'shells/zsh')
| -rw-r--r-- | shells/zsh/Makefile | 3 | ||||
| -rw-r--r-- | shells/zsh/Makefile.common | 8 | ||||
| -rw-r--r-- | shells/zsh/PLIST | 4 |
3 files changed, 7 insertions, 8 deletions
diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile index 7e0684b7de2..abfc0f7fc32 100644 --- a/shells/zsh/Makefile +++ b/shells/zsh/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.41 2003/06/29 04:24:56 uebayasi Exp $ +# $NetBSD: Makefile,v 1.42 2003/08/05 13:37:51 seb Exp $ # .include "../../shells/zsh/Makefile.common" ZSH_VERSION= 4.0.7 -.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/shells/zsh/Makefile.common b/shells/zsh/Makefile.common index c6b4beb25e4..e68531e2d79 100644 --- a/shells/zsh/Makefile.common +++ b/shells/zsh/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.2 2003/06/30 13:46:04 grant Exp $ +# $NetBSD: Makefile.common,v 1.3 2003/08/05 13:37:51 seb Exp $ DISTNAME= zsh-${ZSH_VERSION} CATEGORIES= shells @@ -17,8 +17,9 @@ COMMENT= The Z shell USE_BUILDLINK2= YES USE_PKGINSTALL= YES GNU_CONFIGURE= YES -TEXINFO_OVERRIDE= YES +USE_NEW_TEXINFO= YES +USE_MAKEINFO= YES INFO_FILES= zsh.info .include "../../mk/bsd.prefs.mk" @@ -39,8 +40,9 @@ PLIST_SRC= ${PKGDIR}/PLIST.shlibs ${PKGDIR}/PLIST.dynamic ${PKGDIR}/PLIST PKG_SHELL= ${PREFIX}/bin/zsh +INSTALL_TARGET= install install.info + post-install: - @cd ${WRKSRC}/Doc; ${MAKE} install.info @${INSTALL_DATA_DIR} ${PREFIX}/share/doc/zsh @cd ${WRKSRC}/Etc; ${INSTALL_DATA} BUGS FAQ FEATURES NEWS \ ${PREFIX}/share/doc/zsh diff --git a/shells/zsh/PLIST b/shells/zsh/PLIST index 80464648707..3a9ffb186d1 100644 --- a/shells/zsh/PLIST +++ b/shells/zsh/PLIST @@ -1,9 +1,7 @@ -@comment $NetBSD: PLIST,v 1.8 2003/06/20 05:59:02 uebayasi Exp $ +@comment $NetBSD: PLIST,v 1.9 2003/08/05 13:37:51 seb Exp $ bin/zsh bin/${PKGNAME} -@unexec ${INSTALL_INFO} --delete %D/info/zsh.info %D/info/dir info/zsh.info -@exec ${INSTALL_INFO} %D/info/zsh.info %D/info/dir man/man1/zsh.1 man/man1/zshall.1 man/man1/zshbuiltins.1 |