diff options
| author | jlam <jlam> | 2001-10-24 22:10:43 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2001-10-24 22:10:43 +0000 |
| commit | 973189f9135fdd558ae1245181918d2289fce5b4 (patch) | |
| tree | e280bcd13b77df59c664f968eda46414c756ada4 /x11/ebuilder | |
| parent | b145cb827667e8b409e5f0d7abcfb1570bff7d25 (diff) | |
| download | pkgsrc-973189f9135fdd558ae1245181918d2289fce5b4.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/ebuilder')
| -rw-r--r-- | x11/ebuilder/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/x11/ebuilder/Makefile b/x11/ebuilder/Makefile index 2449ad55f67..e0b5548408c 100644 --- a/x11/ebuilder/Makefile +++ b/x11/ebuilder/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2001/10/23 13:15:07 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2001/10/24 22:11:11 jlam Exp $ # DISTNAME= ebuilder-0.56d @@ -19,6 +19,6 @@ MAKE_ENV+= CXXFLAGS="${CXXFLAGS}" do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/ebuilder ${PREFIX}/bin -.include "../../mk/x11.buildlink.mk" .include "../../x11/qt2-libs/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" |