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 /x11/controlcenter/Makefile | |
| 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 'x11/controlcenter/Makefile')
| -rw-r--r-- | x11/controlcenter/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/x11/controlcenter/Makefile b/x11/controlcenter/Makefile index bee0e541e7e..e2abcb618cb 100644 --- a/x11/controlcenter/Makefile +++ b/x11/controlcenter/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2001/10/23 13:15:07 jlam Exp $ +# $NetBSD: Makefile,v 1.34 2001/10/24 22:11:11 jlam Exp $ DISTNAME= control-center-1.4.0.1 CATEGORIES= x11 gnome @@ -27,10 +27,10 @@ CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR} post-patch: @${ECHO} >>${WRKSRC}/control-center/cappletConf.sh.in "" -.include "../../mk/x11.buildlink.mk" -.include "../../graphics/gdk-pixbuf/buildlink.mk" +.include "../../devel/popt/buildlink.mk" .include "../../devel/gettext-lib/buildlink.mk" +.include "../../graphics/gdk-pixbuf/buildlink.mk" .include "../../sysutils/gnome-vfs/buildlink.mk" .include "../../x11/gnome-libs/buildlink.mk" -.include "../../devel/popt/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" |