From b28533fe59c3ed8a07d089eec0ddb72591404098 Mon Sep 17 00:00:00 2001 From: joerg Date: Wed, 27 Dec 2006 13:37:35 +0000 Subject: - fine grained X11 dependencies for packages which have either USE_IMAKE or USE_X11BASE set, but don't include mk/x11.buildlink3.mk directly or via buildlink3.mks - introduce BUILDLINK_PREFIX.libXpm as alias for BUILDLINK_PREFIX.xpm in the !modular case - fix some cases where the check for libX11 couldn't work at all by using C++ for compilation without including the proper headers Verified using a full X11_TYPE=xorg bulk build without additional breakage. Discussed with salo@, wiz@ and send to packages@ for feedback. --- editors/ted/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'editors/ted') diff --git a/editors/ted/Makefile b/editors/ted/Makefile index 0fbcbfc0f3d..a8e54cf234b 100644 --- a/editors/ted/Makefile +++ b/editors/ted/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2006/12/15 20:32:54 joerg Exp $ +# $NetBSD: Makefile,v 1.32 2006/12/27 13:37:36 joerg Exp $ DISTNAME= ted-2.16.src PKGNAME= ted-2.16 @@ -30,8 +30,8 @@ CONFIGURE_ENV+= ac_tiff_includes="${BUILDLINK_PREFIX.tiff}/include" CONFIGURE_ENV+= ac_tiff_libraries="${BUILDLINK_PREFIX.tiff}/lib" CONFIGURE_ENV+= ac_xm_includes="${BUILDLINK_PREFIX.openmotif}/include" CONFIGURE_ENV+= ac_xm_libraries="${BUILDLINK_PREFIX.openmotif}/lib" -CONFIGURE_ENV+= ac_xpm_includes="${BUILDLINK_PREFIX.xpm}/include" -CONFIGURE_ENV+= ac_xpm_libraries="${BUILDLINK_PREFIX.xpm}/lib" +CONFIGURE_ENV+= ac_xpm_includes="${BUILDLINK_PREFIX.libXpm}/include" +CONFIGURE_ENV+= ac_xpm_libraries="${BUILDLINK_PREFIX.libXpm}/lib" CONFIGURE_ENV+= ac_zlib_includes="${BUILDLINK_PREFIX.zlib}/include" CONFIGURE_ENV+= ac_zlib_libraries="${BUILDLINK_PREFIX.zlib}/lib" -- cgit v1.2.3