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 /emulators | |
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 'emulators')
-rw-r--r-- | emulators/vice/Makefile | 4 | ||||
-rw-r--r-- | emulators/zsnes/Makefile | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile index 6f72f4f47b2..b5c46aed211 100644 --- a/emulators/vice/Makefile +++ b/emulators/vice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2001/10/23 13:14:51 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2001/10/24 22:10:54 jlam Exp $ # DISTNAME= vice-1.7 @@ -63,13 +63,13 @@ post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/vice ${MV} ${PREFIX}/share/doc/vice/*.html ${PREFIX}/share/doc/html/vice -.include "../../mk/x11.buildlink.mk" .include "../../audio/esound/buildlink.mk" .include "../../devel/readline/buildlink.mk" .include "../../devel/gettext-lib/buildlink.mk" .include "../../devel/zlib/buildlink.mk" #.include "../../graphics/png/buildlink.mk" .include "../../graphics/xpm/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" # This is the emulator's recommended setting. We place it last so that it diff --git a/emulators/zsnes/Makefile b/emulators/zsnes/Makefile index 7fa69c0f5f5..c12395f454c 100644 --- a/emulators/zsnes/Makefile +++ b/emulators/zsnes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/10/23 13:14:51 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2001/10/24 22:10:54 jlam Exp $ # DISTNAME= zsnes1337src @@ -23,7 +23,7 @@ USE_GMAKE= # defined USE_CONFIG_WRAPPER= # defined USE_BUILDLINK_ONLY= # defined -.include "../../mk/x11.buildlink.mk" .include "../../devel/SDL/buildlink.mk" .include "../../graphics/png/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" |