diff options
| author | jlam <jlam@pkgsrc.org> | 2001-10-10 05:57:14 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-10-10 05:57:14 +0000 |
| commit | c46d036469b2a7e7f777f636be7795a8e1ec4de1 (patch) | |
| tree | 4bf9b217aaa6f5237c1a0c049181b15df9ecd9b2 /mk | |
| parent | 1ecbbfc56d7b8e5539314bc22f26ac75fa5834a2 (diff) | |
| download | pkgsrc-c46d036469b2a7e7f777f636be7795a8e1ec4de1.tar.gz | |
Allow people who set USE_BUILDLINK_X11 so as to experiment with the
buildlink-x11 package, to have that package installed.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 11663f6788c..668f9803d99 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.824 2001/10/09 13:54:10 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.825 2001/10/10 05:57:14 jlam Exp $ # # This file is in the public domain. # @@ -137,13 +137,13 @@ PREFIX= ${LOCALBASE} # We need to make sure the buildlink-x11 package is not installed since it # currently breaks builds that use imake. # -.if defined(USE_IMAKE) +.if defined(USE_IMAKE) && !defined(USE_BUILDLINK_X11) . if exists(${LOCALBASE}/lib/X11/config/buildlinkX11.def) || \ exists(${X11BASE}/lib/X11/config/buildlinkX11.def) IGNORE+= "${PKGNAME} uses imake, but the buildlink-x11 package was found." \ " Please deinstall it (pkg_delete buildlink-x11)." . endif -.endif # USE_IMAKE +.endif # USE_IMAKE && !USE_BUILDLINK_X11 .if defined(USE_GMAKE) BUILD_DEPENDS+= gmake>=3.78:../../devel/gmake |