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 /time | |
| 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 'time')
| -rw-r--r-- | time/asclock-gtk/Makefile | 4 | ||||
| -rw-r--r-- | time/glclock/Makefile | 4 | ||||
| -rw-r--r-- | time/plan/Makefile | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/time/asclock-gtk/Makefile b/time/asclock-gtk/Makefile index 30b3c1b1e35..a070394d023 100644 --- a/time/asclock-gtk/Makefile +++ b/time/asclock-gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/10/23 13:15:03 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2001/10/24 22:11:07 jlam Exp $ # DISTNAME= asclock-gtk-2.1.10beta @@ -37,6 +37,6 @@ do-install: ${CP} -R ${WRKSRC}/themes/* ${PREFIX}/share/asclock-gtk ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/asclock-gtk -.include "../../mk/x11.buildlink.mk" .include "../../x11/gtk/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/time/glclock/Makefile b/time/glclock/Makefile index 2705bf648bc..35830ae10a6 100644 --- a/time/glclock/Makefile +++ b/time/glclock/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/10/23 13:15:03 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2001/10/24 22:11:08 jlam Exp $ # DISTNAME= glclock-6.0b6.0 @@ -26,6 +26,6 @@ do-install: # mwclock woodclock;do \ # ${INSTALL_SCRIPT} ${WRKSRC}/$$i ${PREFIX}/bin; done -.include "../../mk/x11.buildlink.mk" .include "../../graphics/Mesa/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/time/plan/Makefile b/time/plan/Makefile index 3ff1940810d..502bfcb39a1 100644 --- a/time/plan/Makefile +++ b/time/plan/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/10/23 13:15:03 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2001/10/24 22:11:08 jlam Exp $ # DISTNAME= plan-1.8.4 @@ -22,6 +22,6 @@ pre-install: ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/$$f ${PREFIX}/share/plan; \ done -.include "../../mk/x11.buildlink.mk" .include "../../mk/motif.buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" |