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 /databases/tk-postgresql | |
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 'databases/tk-postgresql')
-rw-r--r-- | databases/tk-postgresql/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/databases/tk-postgresql/Makefile b/databases/tk-postgresql/Makefile index 14bee24db8c..9f7dd8964e9 100644 --- a/databases/tk-postgresql/Makefile +++ b/databases/tk-postgresql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/10/23 12:51:19 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2001/10/24 22:10:50 jlam Exp $ .include "../../databases/postgresql/Makefile.common" .include "../../databases/postgresql/Makefile.ssl" @@ -40,8 +40,8 @@ post-install: ${GTAR} zxCf ${PREFIX}/man ${WRKSRC}/doc/man.tar.gz \ `${SED} -e "s|#.*||" ${FILESDIR}/man.tk` -.include "../../mk/x11.buildlink.mk" .include "../../databases/postgresql-lib/buildlink.mk" .include "../../databases/tcl-postgresql/buildlink.mk" .include "../../x11/tk/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" |