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 /sysutils/xps | |
| 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 'sysutils/xps')
| -rw-r--r-- | sysutils/xps/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sysutils/xps/Makefile b/sysutils/xps/Makefile index 4cd831821a5..0d3db08aea1 100644 --- a/sysutils/xps/Makefile +++ b/sysutils/xps/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2001/10/23 13:15:03 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2001/10/24 22:11:07 jlam Exp $ DISTNAME= xps-3.14 CATEGORIES= sysutils @@ -17,6 +17,6 @@ USE_BUILDLINK_ONLY= # defined GNU_CONFIGURE= # defined CONFIGURE_ENV+= XINCLUDES="-I${BUILDLINK_X11_DIR}/include" -.include "../../mk/x11.buildlink.mk" .include "../../mk/motif.buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" |