diff options
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/freetype-lib/Makefile.common | 6 | ||||
| -rw-r--r-- | graphics/png/Makefile | 5 | ||||
| -rw-r--r-- | graphics/tiff/Makefile | 5 | ||||
| -rw-r--r-- | graphics/tiff/files/config.site | 8 |
4 files changed, 8 insertions, 16 deletions
diff --git a/graphics/freetype-lib/Makefile.common b/graphics/freetype-lib/Makefile.common index 994478924a3..8b24db11ae1 100644 --- a/graphics/freetype-lib/Makefile.common +++ b/graphics/freetype-lib/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.13 2001/06/10 00:08:44 jlam Exp $ +# $NetBSD: Makefile.common,v 1.14 2001/06/11 02:05:10 jlam Exp $ DISTNAME= freetype-${FT_VERS} FT_VERS= 1.3.1 @@ -28,8 +28,4 @@ PATCHDIR= ${.CURDIR}/../../graphics/freetype-lib/patches CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" CONFIGURE_ENV+= LIBS="${LIBS}" -CPPFLAGS+= -I${BUILDLINK_INCDIR} -CFLAGS+= -I${BUILDLINK_INCDIR} -LDFLAGS+= -L${BUILDLINK_LIBDIR} - .include "../../mk/bsd.pkg.mk" diff --git a/graphics/png/Makefile b/graphics/png/Makefile index 695575cd545..35e556ce833 100644 --- a/graphics/png/Makefile +++ b/graphics/png/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2001/06/10 00:08:44 jlam Exp $ +# $NetBSD: Makefile,v 1.35 2001/06/11 02:05:11 jlam Exp $ # On update, don't forget to increase shared library major/minor's in # accordance with changes (patch-aa). @@ -21,9 +21,6 @@ MAKE_ENV+= REALCC="${CC}" .include "../../devel/zlib/buildlink.mk" -CFLAGS+= -I${BUILDLINK_INCDIR} -LDFLAGS+= -L${BUILDLINK_LIBDIR} - post-install: ${INSTALL_MAN} ${WRKSRC}/libpng.3 ${PREFIX}/man/man3 ${INSTALL_MAN} ${WRKSRC}/libpngpf.3 ${PREFIX}/man/man3 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 |