diff options
| author | jlam <jlam> | 2001-05-28 02:50:24 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2001-05-28 02:50:24 +0000 |
| commit | 9bc0fc55e02ef6660a523871b9dc2e108d097537 (patch) | |
| tree | 266264c06bfcf3d70dca4827647bafda09f9c325 /graphics/tiff/Makefile | |
| parent | 012162248bde75cdea6b13ddffbf22d82677f4a1 (diff) | |
| download | pkgsrc-9bc0fc55e02ef6660a523871b9dc2e108d097537.tar.gz | |
Find location of zlib using EVAL_PREFIX. Use buildlink.mk files to find
the required headers and libraries for jpeg and zlib.
Diffstat (limited to 'graphics/tiff/Makefile')
| -rw-r--r-- | graphics/tiff/Makefile | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile index 178bf782d11..f54e759e601 100644 --- a/graphics/tiff/Makefile +++ b/graphics/tiff/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2001/05/03 13:22:50 skrll Exp $ +# $NetBSD: Makefile,v 1.31 2001/05/28 02:50:24 jlam Exp $ DISTNAME= tiff-v3.5.5 PKGNAME= tiff-3.5.5 @@ -13,21 +13,17 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.libtiff.org/ COMMENT= library and tools for reading and writing TIFF data files -DEPENDS+= jpeg-6b:../../graphics/jpeg - USE_LIBTOOL= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= --noninteractive --site=${FILESDIR} CONFIGURE_ENV+= CC="${CC}" .include "../../mk/bsd.prefs.mk" +.include "../../devel/zlib/buildlink.mk" +.include "../../graphics/jpeg/buildlink.mk" -.if (${OPSYS} == "SunOS") -ZLIBDIR= ${LOCALBASE}/lib -DEPENDS+= zlib-*:../../devel/zlib -.else -ZLIBDIR= /usr/lib -.endif +ZLIBDIR_DEFAULT= /usr/lib +EVAL_PREFIX+= ZLIBDIR=zlib .if defined(USE_GIF) DISTFILES+= libtiff-lzw-compression-kit-1.1.tar.gz @@ -41,8 +37,12 @@ post-patch: .endif CPPFLAGS+= -Dunix -CONFIGURE_ENV+= PREFIX="${PREFIX}" LOCALBASE="${LOCALBASE}" \ - ENVOPTS="${CFLAGS} ${CPPFLAGS}" ZLIBDIR="${ZLIBDIR}" +CONFIGURE_ENV+= PREFIX="${PREFIX}" +CONFIGURE_ENV+= LOCALBASE="${LOCALBASE}" +CONFIGURE_ENV+= ENVOPTS="${CFLAGS} ${CPPFLAGS}" +CONFIGURE_ENV+= ZLIBDIR="${ZLIBDIR}" +CONFIGURE_ENV+= BUILDLINK_INCDIR=${BUILDLINK_INCDIR} +CONFIGURE_ENV+= BUILDLINK_LIBDIR=${BUILDLINK_LIBDIR} pre-patch: # reference correct relative man page when using .so @@ -58,4 +58,6 @@ pre-patch: ${SED} -e "s,\(\$${CC} -o\),\$${LIBTOOL} \1,g" \ ${WRKSRC}/tools/Makefile.in.in > ${WRKSRC}/tools/Makefile.in +pre-configure: ${BUILDLINK_TARGETS} + .include "../../mk/bsd.pkg.mk" |