diff options
| author | jlam <jlam@pkgsrc.org> | 2004-02-18 13:33:40 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-02-18 13:33:40 +0000 |
| commit | efa1ab70ba871ae157aeaa0b56ad9a331eb91e69 (patch) | |
| tree | e6391a0a29cee2898ed380fe3328cb0b69890ce3 /textproc | |
| parent | c40ee95964564e28bc4d27851d406f8cd0048057 (diff) | |
| download | pkgsrc-efa1ab70ba871ae157aeaa0b56ad9a331eb91e69.tar.gz | |
Include "../../mk/compiler.mk" to get the value of CC_VERSION before
testing it.
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/icu/Makefile | 4 | ||||
| -rw-r--r-- | textproc/sablotron/Makefile | 4 | ||||
| -rw-r--r-- | textproc/sp/Makefile | 18 |
3 files changed, 13 insertions, 13 deletions
diff --git a/textproc/icu/Makefile b/textproc/icu/Makefile index 56fd129024a..fc09f12cc40 100644 --- a/textproc/icu/Makefile +++ b/textproc/icu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2004/01/24 15:13:20 grant Exp $ +# $NetBSD: Makefile,v 1.29 2004/02/18 13:33:41 jlam Exp $ # DISTNAME= icu-2.6.1 @@ -37,7 +37,7 @@ SUPPORT_FILES+= ${PREFIX}/share/examples/icu/convrtrs.txt \ CONFIGURE_ARGS+= --disable-threads .endif -.include "../../mk/bsd.prefs.mk" +.include "../../mk/compiler.mk" .if !empty(CC_VERSION:Mgcc-3*) CXXFLAGS:= ${CXXFLAGS:C/-O[0-9]*/-O/g} diff --git a/textproc/sablotron/Makefile b/textproc/sablotron/Makefile index 0618267b728..49395aea02e 100644 --- a/textproc/sablotron/Makefile +++ b/textproc/sablotron/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2004/02/14 17:21:53 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2004/02/18 13:33:41 jlam Exp $ DISTNAME= Sablot-1.0.1 PKGNAME= ${DISTNAME:S/Sablot/sablotron/} @@ -21,7 +21,7 @@ USE_LIBTOOL= YES # buildlink2 finds. LIBS+= ${_BLNK_ICONV_LDFLAGS} -.include "../../mk/bsd.prefs.mk" +.include "../../mk/compiler.mk" # both libstdc++ and libm are required for gcc 2.95.x, as libstdc++ # does not include the math functions. gcc3 only needs libstdc++. diff --git a/textproc/sp/Makefile b/textproc/sp/Makefile index a4bc190a1de..94374d51f28 100644 --- a/textproc/sp/Makefile +++ b/textproc/sp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2004/02/09 03:26:39 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2004/02/18 13:33:41 jlam Exp $ # DISTNAME= sp-1.3.4 @@ -25,21 +25,21 @@ MAKE_ENV+= SGML_DEFAULT_CATALOG="${SGML_DEFAULT_CATALOG}" SGML_CATALOGS= ${PREFIX}/share/sgml/dtd/html.soc -post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sp ${PREFIX}/share/sgml/dtd - cd ${WRKSRC}/doc; for n in *.htm ; do ${INSTALL_DATA} $$n ${PREFIX}/share/doc/sp/$n ; done - cd ${WRKSRC}/pubtext; for n in * ; do ${INSTALL_DATA} $$n ${PREFIX}/share/sgml/dtd/$n ; done - cd ${WRKSRC}/lib; ${INSTALL_DATA} libsp.a ${PREFIX}/lib/libsp.a - -.include "../../mk/bsd.prefs.mk" +.include "../../mk/compiler.mk" -post-patch: .if !empty(CC_VERSION:Mgcc-2.8.1) +post-patch: @cd ${WRKSRC}; \ for FILE in ${PATCHDIR}/egcs-patch-*; do \ ${PATCH} ${PATCH_ARGS} < $$FILE; \ done .endif +post-install: + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sp ${PREFIX}/share/sgml/dtd + cd ${WRKSRC}/doc; for n in *.htm ; do ${INSTALL_DATA} $$n ${PREFIX}/share/doc/sp/$n ; done + cd ${WRKSRC}/pubtext; for n in * ; do ${INSTALL_DATA} $$n ${PREFIX}/share/sgml/dtd/$n ; done + cd ${WRKSRC}/lib; ${INSTALL_DATA} libsp.a ${PREFIX}/lib/libsp.a + .include "../../textproc/xmlcatmgr/catalogs.mk" .include "../../mk/bsd.pkg.mk" |