diff options
| author | jlam <jlam@pkgsrc.org> | 2006-03-20 18:15:37 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-03-20 18:15:37 +0000 |
| commit | 741aecb60794fe08a7a2c61bfcc516bee56c6a2b (patch) | |
| tree | 0f05903ff61fcd859ec72aa544fa1e5eda653bf6 /math/octave | |
| parent | 6132a5c7603ce3eb9c6eaaf83c45b47f9e30fa6d (diff) | |
| download | pkgsrc-741aecb60794fe08a7a2c61bfcc516bee56c6a2b.tar.gz | |
* Nuke all references to and definitions of INFO_DIR in package Makefiles
and replace with appropriate references to PKGINFODIR instead.
* Properly account for split info files during installation.
* Move info file listings directly into the package PLISTs.
This fixes info-file-related PLIST problems.
Diffstat (limited to 'math/octave')
| -rw-r--r-- | math/octave/Makefile | 9 | ||||
| -rw-r--r-- | math/octave/PLIST | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/math/octave/Makefile b/math/octave/Makefile index 07ada8df0fb..59ba87b4233 100644 --- a/math/octave/Makefile +++ b/math/octave/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.64 2006/03/09 15:43:46 jlam Exp $ +# $NetBSD: Makefile,v 1.65 2006/03/20 18:15:38 jlam Exp $ DISTNAME= octave-${OCTAVE_VER} PKGREVISION= 1 @@ -42,8 +42,7 @@ CONFIGURE_ARGS+= --enable-dl GNU_PLATFORM_DIR!= ${.CURDIR}/../../mk/gnu-config/config.sub ${MACHINE_GNU_PLATFORM} PLIST_SUBST+= GNU_PLATFORM_DIR=${GNU_PLATFORM_DIR:Q} -INFO_FILES= octave.info liboctave.info -LIBOCTAVE_INFO= liboctave.info liboctave.info-[0-9]* +INFO_FILES= # PLIST OCTAVE_DOC= faq/Octave-FAQ.ps interpreter/octave.ps \ liboctave/liboctave.ps refcard/refcard-a4.ps \ refcard/refcard-legal.ps refcard/refcard-letter.ps @@ -73,9 +72,9 @@ post-build: post-install: cd ${WRKSRC}/doc/liboctave; \ - for f in ${LIBOCTAVE_INFO}; do \ + for f in liboctave.info liboctave.info-[0-9]*; do \ ${TEST} ! -f "$$f" || \ - ${INSTALL_DATA} "$$f" ${PREFIX}/${INFO_DIR}; \ + ${INSTALL_DATA} "$$f" ${PREFIX}/${PKGINFODIR}; \ done ${INSTALL_DATA_DIR} ${PREFIX}/share/octave/${OCTAVE_VER}/doc .for f in ${OCTAVE_DOC} diff --git a/math/octave/PLIST b/math/octave/PLIST index 936351b0405..c0faf168dc1 100644 --- a/math/octave/PLIST +++ b/math/octave/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.11 2005/11/29 13:11:05 adam Exp $ +@comment $NetBSD: PLIST,v 1.12 2006/03/20 18:15:38 jlam Exp $ bin/mkoctfile bin/mkoctfile-${PKGVERSION} bin/octave @@ -550,6 +550,8 @@ include/octave-${PKGVERSION}/octave/vx-s-ccv.h include/octave-${PKGVERSION}/octave/vx-s-crv.h include/octave-${PKGVERSION}/octave/xdiv.h include/octave-${PKGVERSION}/octave/xpow.h +info/liboctave.info +info/octave.info lib/libcruft.la lib/liboctave.la lib/liboctinterp.la |