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 /x11/gnome-core | |
| 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 'x11/gnome-core')
| -rw-r--r-- | x11/gnome-core/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/x11/gnome-core/Makefile b/x11/gnome-core/Makefile index 93e01b1bc01..6b20d6bbf01 100644 --- a/x11/gnome-core/Makefile +++ b/x11/gnome-core/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.71 2001/10/23 13:15:08 jlam Exp $ +# $NetBSD: Makefile,v 1.72 2001/10/24 22:11:12 jlam Exp $ DISTNAME= gnome-core-1.4.0.4 CATEGORIES= x11 gnome @@ -42,12 +42,12 @@ post-install: .endfor .endfor -.include "../../mk/x11.buildlink.mk" .include "../../archivers/bzip2/buildlink.mk" +.include "../../devel/gettext-lib/buildlink.mk" +.include "../../devel/libglade/buildlink.mk" .include "../../graphics/gdk-pixbuf-gnome/buildlink.mk" -.include "../../www/libghttp/buildlink.mk" .include "../../textproc/libxml/buildlink.mk" -.include "../../devel/libglade/buildlink.mk" .include "../../www/gtkhtml/buildlink.mk" -.include "../../devel/gettext-lib/buildlink.mk" +.include "../../www/libghttp/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" |