summaryrefslogtreecommitdiff
path: root/japanese
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2001-06-11 02:05:07 +0000
committerjlam <jlam@pkgsrc.org>2001-06-11 02:05:07 +0000
commitdbfde59b14f3df33f921b522c83796d99919502c (patch)
tree8a4903fb4961ac3e5118ca00c446b0bcfea9697d /japanese
parent072be2ad69b44757c1fda013ef9c97ac9969c501 (diff)
downloadpkgsrc-dbfde59b14f3df33f921b522c83796d99919502c.tar.gz
The buildlink include and lib directories are added to CFLAGS, CPPFLAGS,
CXXFLAGS, and LDFLAGS by the buildlink.mk files so remove the extra definitions to add them from the package Makefiles. As advised by the bsd.buildlink.mk file, also ensure that the buildlink.mk files are included prior to defining any package-specific CFLAGS/LDFLAGS to ensure that the buildlink directories are at the head of the compiler search paths.
Diffstat (limited to 'japanese')
-rw-r--r--japanese/vflib-lib/Makefile.common9
1 files changed, 3 insertions, 6 deletions
diff --git a/japanese/vflib-lib/Makefile.common b/japanese/vflib-lib/Makefile.common
index 3dbab4af40a..226f3007c04 100644
--- a/japanese/vflib-lib/Makefile.common
+++ b/japanese/vflib-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2001/06/10 00:08:45 jlam Exp $
+# $NetBSD: Makefile.common,v 1.11 2001/06/11 02:05:11 jlam Exp $
# FreeBSD Id: Makefile,v 1.20 1999/05/03 01:58:33 steve Exp $
DISTNAME= VFlib2-${VFLIB_VERSION}
@@ -21,8 +21,8 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
.include "../../graphics/freetype-lib/buildlink.mk"
FT_LIB= ttf -lintl
-FT_INCLUDEDIR= ${BUILDLINK_INCDIR}/freetype
-FT_LIBDIR= ${BUILDLINK_LIBDIR}
+FT_INCLUDEDIR= ${BUILDLINK_DIR}/include/freetype
+FT_LIBDIR= ${BUILDLINK_DIR}/lib
GNU_CONFIGURE= # defined
CONFIGURE_ARGS+= --with-freetype="${FT_LIB}"
@@ -30,9 +30,6 @@ CONFIGURE_ARGS+= --with-freetype-includedir=${FT_INCLUDEDIR}
CONFIGURE_ARGS+= --with-freetype-libdir=${FT_LIBDIR}
MAKE_ENV+= LOCAL_LDFLAGS="${LDFLAGS}"
-CFLAGS+= -I${BUILDLINK_INCDIR}
-LDFLAGS+= -L${BUILDLINK_LIBDIR}
-
DISTINFO_FILE= ${.CURDIR}/../../japanese/vflib-lib/distinfo
PATCHDIR= ${.CURDIR}/../../japanese/vflib-lib/patches