diff options
Diffstat (limited to 'graphics/tiff')
| -rw-r--r-- | graphics/tiff/Makefile | 5 | ||||
| -rw-r--r-- | graphics/tiff/files/config.site | 8 |
2 files changed, 6 insertions, 7 deletions
diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile index 6ebb97fde3c..85e33fc02cc 100644 --- a/graphics/tiff/Makefile +++ b/graphics/tiff/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2001/06/10 00:08:45 jlam Exp $ +# $NetBSD: Makefile,v 1.33 2001/06/11 02:05:11 jlam Exp $ DISTNAME= tiff-v3.5.5 PKGNAME= tiff-3.5.5 @@ -41,8 +41,7 @@ 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} +CONFIGURE_ENV+= BUILDLINK_DIR="${BUILDLINK_DIR}" pre-patch: # reference correct relative man page when using .so diff --git a/graphics/tiff/files/config.site b/graphics/tiff/files/config.site index b28b4f59d4d..655f521a935 100644 --- a/graphics/tiff/files/config.site +++ b/graphics/tiff/files/config.site @@ -1,23 +1,23 @@ -# $NetBSD: config.site,v 1.6 2001/05/28 02:50:25 jlam Exp $ +# $NetBSD: config.site,v 1.7 2001/06/11 02:05:11 jlam Exp $ DIR_BIN=${PREFIX}/bin # destination for applications DIR_LIB=${PREFIX}/lib # destination for library DIR_INC=${PREFIX}/include # destination for include files DIR_MAN=${PREFIX}/man # destination for man pages DIR_HTML=${PREFIX}/share/doc/html/tiff # destination for html documentation -DIRS_LIBINC=${BUILDLINK_INCDIR} # dirs to search for ancillary includes +DIRS_LIBINC=${BUILDLINK_DIR}/include # dirs to search for ancillary includes # JPEG support # JPEG=yes DIR_JPEGLIB=${LOCALBASE}/lib -LIBJPEG="-Wl,-R${DIR_JPEGLIB} -L${BUILDLINK_LIBDIR} -ljpeg" +LIBJPEG="-Wl,-R${DIR_JPEGLIB} -L${BUILDLINK_DIR}/lib -ljpeg" # ZLIB compression support # ZIP=yes DIR_GZLIB=${ZLIBDIR} -LIBGZ="-Wl,-R${DIR_GZLIB} -L${BUILDLINK_LIBDIR} -lz" +LIBGZ="-Wl,-R${DIR_GZLIB} -L${BUILDLINK_DIR}/lib -lz" DSO=no # don't use libtiff's shared lib mechanism |