diff options
| author | jlam <jlam> | 2001-10-24 22:10:43 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2001-10-24 22:10:43 +0000 |
| commit | 9d18cbcf3d344d366ec69d93d4b07cfec98c8420 (patch) | |
| tree | e280bcd13b77df59c664f968eda46414c756ada4 /mk | |
| parent | a2d21cd479d03393f90038ec217263fd6e918fbe (diff) | |
| download | pkgsrc-9d18cbcf3d344d366ec69d93d4b07cfec98c8420.tar.gz | |
I am a triple idiot. The only relevant variable that x11.buildlink.mk
redefines about which buildlink.mk files would care is BUILDLINK_X11_DIR,
which points to the location of the X11R6 hierarchy used during building.
If x11.buildlink.mk isn't included, then BUILDLINK_X11_DIR defaults to
${X11BASE} (set in bsd.pkg.mk), so its value is always safe to use. Remove
the ifdefs surrounding the use of BUILDLINK_X11_DIR in tk/buildlink.mk and
revert changes to move x11.buildlink.mk before the other buildlink.mk files.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/x11.buildlink.mk | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/mk/x11.buildlink.mk b/mk/x11.buildlink.mk index 8c8cf9b2a97..35c496e8275 100644 --- a/mk/x11.buildlink.mk +++ b/mk/x11.buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: x11.buildlink.mk,v 1.10 2001/10/23 13:15:00 jlam Exp $ +# $NetBSD: x11.buildlink.mk,v 1.11 2001/10/24 22:11:05 jlam Exp $ # # This Makefile fragment is included by packages that use X11. # @@ -10,9 +10,6 @@ # # NOTE: This file must be included _before_ bsd.pkg.mk. # NOTE: This file should _not_ be included in any package's buildlink.mk file. -# NOTE: This file should be included _before_ any buildlink.mk files that -# use X11_BUILDLINK_MK as a test value. Generally, this file should be -# included before the other buildlink.mk files. .if !defined(X11_BUILDLINK_MK) X11_BUILDLINK_MK= # defined |