diff options
| author | veego <veego> | 2001-01-26 22:54:00 +0000 |
|---|---|---|
| committer | veego <veego> | 2001-01-26 22:54:00 +0000 |
| commit | 7c119078590ae4379c813a9470b0d0b1ee181a9e (patch) | |
| tree | 14a6b8229b3a5f2aab0954212704c98aabcbd534 /math/octave | |
| parent | 764beb2e9f63e8191af2bd5da130ad65a6add36d (diff) | |
| download | pkgsrc-7c119078590ae4379c813a9470b0d0b1ee181a9e.tar.gz | |
Move the include of mk/bsd.pkg.mk to the end so post-patch doesn't cause
make warnings and change the way EGCS_VERSION is defined.
Diffstat (limited to 'math/octave')
| -rw-r--r-- | math/octave/Makefile | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/math/octave/Makefile b/math/octave/Makefile index 7270c1f3087..8056faba682 100644 --- a/math/octave/Makefile +++ b/math/octave/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2000/08/15 21:01:51 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2001/01/26 22:54:00 veego Exp $ # FreeBSD Id: Makefile,v 1.18 1998/09/27 20:10:45 steve Exp DISTNAME= octave-2.0.16 @@ -40,16 +40,18 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/doc/faq/Octave-FAQ.ps ${PREFIX}/share/octave/2.0.16/doc .include "../../mk/bsd.prefs.mk" -.include "../../mk/bsd.pkg.mk" GCC_VERSION!= ${CC} --version -EGCS_VERSION!= ${CC} -v 2>&1 | ${AWK} '{print $$4}' post-patch: .if ${GCC_VERSION:C/-.*$$//} == egcs - ${TEST} ${EGCS_VERSION} -lt 19981201 && \ - @cd ${WRKSRC}; - for FILE in ${PATCHDIR}/egcs-patch-*; do \ - ${PATCH} ${PATCH_ARGS} <$$FILE; \ - done + @EGCS_VERSION=`${CC} -v 2>&1 | ${AWK} '{print $$4}'`; \ + if [ $$EGCS_VERSION -lt 19981201 ]; then \ + cd ${WRKSRC}; \ + for FILE in ${PATCHDIR}/egcs-patch-*; do \ + ${PATCH} ${PATCH_ARGS} <$$FILE; \ + done; \ + fi .endif + +.include "../../mk/bsd.pkg.mk" |