diff options
| author | jlam <jlam@pkgsrc.org> | 2001-10-24 22:10:43 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-10-24 22:10:43 +0000 |
| commit | a4bc16d30c123e03c4125fdd70bde0eb8a71f4a4 (patch) | |
| tree | e280bcd13b77df59c664f968eda46414c756ada4 /games/freeciv-client-gtk | |
| parent | 452509b0a2eb744db237df7645a87161418d6935 (diff) | |
| download | pkgsrc-a4bc16d30c123e03c4125fdd70bde0eb8a71f4a4.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 'games/freeciv-client-gtk')
| -rw-r--r-- | games/freeciv-client-gtk/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/games/freeciv-client-gtk/Makefile b/games/freeciv-client-gtk/Makefile index e8455dfe463..a5f7ebaf14e 100644 --- a/games/freeciv-client-gtk/Makefile +++ b/games/freeciv-client-gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2001/10/23 13:14:52 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2001/10/24 22:10:55 jlam Exp $ PKGNAME= ${DISTNAME:S/-/-client-gtk-/} COMMENT= Freeciv client with GTK+ interface @@ -18,8 +18,8 @@ do-install: cd ${WRKSRC}/client; ${SETENV} ${MAKE_ENV} \ ${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_TARGET} -.include "../../mk/x11.buildlink.mk" .include "../../devel/zlib/buildlink.mk" .include "../../graphics/imlib/buildlink.mk" .include "../../x11/gtk/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" |