Standardize name of file to include for build-links to be "buildlink.mk".

Use BUILDLINK_INCDIR, BUILDLINK_LIBDIR for locations of linked headers
and libraries.  Create a variable BUILDLINK_TARGETS whose value is the
list of build-link targets to execute.

4 files changed, 23 insertions, 24 deletions

diff --git a/databases/postgresql-client/Makefile b/databases/postgresql-client/Makefile
index 37ec2d68cca..3fe2de67216 100644
--- a/databases/postgresql-client/Makefile
+++ b/databases/postgresql-client/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2001/05/16 05:30:33 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/05/24 08:53:55 jlam Exp $
 
 .include "../../databases/postgresql/Makefile.common"
 .include "../../databases/postgresql/Makefile.ssl"
-.include "../../devel/libgetopt/Makefile.getopt"
-.include "../../devel/readline/Makefile.readline"
+.include "../../devel/libgetopt/buildlink.mk"
+.include "../../devel/readline/buildlink.mk"
 
 PKGNAME=		postgresql-client-${PG_VERS}
 PG_PKG_VERS=		# empty
@@ -16,7 +16,7 @@ CONFIGURE_ARGS+=	--enable-readline
 
 DIRS_TO_BUILD=		src/bin
 
-pre-configure: link-getopt-headers link-readline-headers link-readline-libs
+pre-configure: ${BUILDLINK_TARGETS}
 
 pre-build:
 	cd ${WRKSRC}/src/bin/psql &&					\
diff --git a/databases/postgresql-server/Makefile b/databases/postgresql-server/Makefile
index 2340c60e0b9..919fc33779c 100644
--- a/databases/postgresql-server/Makefile
+++ b/databases/postgresql-server/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2001/05/21 16:02:50 abs Exp $
+# $NetBSD: Makefile,v 1.6 2001/05/24 08:53:55 jlam Exp $
 
 .include "../../databases/postgresql/Makefile.common"
 .include "../../databases/postgresql/Makefile.ssl"
-.include "../../devel/libgetopt/Makefile.getopt"
+.include "../../devel/libgetopt/buildlink.mk"
 
 PKGNAME=		postgresql-server-${PG_VERS}
 PG_PKG_VERS=		# empty
@@ -42,7 +42,7 @@ ADDGROUP=		groupadd
 DEINSTALL_FILE=		${WRKDIR}/DEINSTALL
 INSTALL_FILE=		${WRKDIR}/INSTALL
 
-pre-configure: link-getopt-headers
+pre-configure: ${BUILDLINK_TARGETS}
 
 do-build:
 .for DIR in ${DIRS_TO_BUILD}
diff --git a/databases/postgresql/Makefile.common b/databases/postgresql/Makefile.common
index 009668fc21e..4d1c6504566 100644
--- a/databases/postgresql/Makefile.common
+++ b/databases/postgresql/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2001/05/16 05:28:55 jlam Exp $
+# $NetBSD: Makefile.common,v 1.16 2001/05/24 08:54:27 jlam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution.
@@ -79,20 +79,19 @@ CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
 CONFIGURE_ENV+=		LIBS="${LIBS}"
 MAKE_ENV+=		CUSTOM_COPT="${CFLAGS}"
 
-WRKINCDIR=		${WRKDIR}/include
-WRKLIBDIR=		${WRKDIR}/lib
-CPPFLAGS+=		-I${WRKINCDIR}
-CFLAGS+=		-I${WRKINCDIR}
-LDFLAGS+=		-L${WRKLIBDIR}
+CPPFLAGS+=		-I${BUILDLINK_INCDIR}
+CFLAGS+=		-I${BUILDLINK_INCDIR}
+LDFLAGS+=		-L${BUILDLINK_LIBDIR}
 
-# The following is a hack to force ${WRKLIBDIR} to the front of the linker's
-# library search path without having to patch a lot of Makefile.  It works
-# because the PostgreSQL Makefiles invoke the linker with $(CFLAGS) as well.
+# The following is a hack to force ${BUILDLINK_LIBDIR} to the front of the
+# linker's library search path without having to patch a lot of Makefile.
+# It works because the PostgreSQL Makefiles invoke the linker with $(CFLAGS)
+# as well.
 # 
-CFLAGS+=		-L${WRKLIBDIR}
+CFLAGS+=		-L${BUILDLINK_LIBDIR}
 
 post-extract:
-	${MKDIR} -p ${WRKINCDIR} ${WRKLIBDIR}
+	${MKDIR} ${BUILDLINK_INCDIR} ${BUILDLINK_LIBDIR}
 	if [ -d ${WRKSRC}/src ]; then					\
 		${RM} -f ${WRKSRC}/src/Makefile.custom;			\
 		${CP} -f ${COMMON_FILESDIR}/Makefile.custom		\
diff --git a/databases/sqsh/Makefile b/databases/sqsh/Makefile
index e01fa196feb..8276baf09a8 100644
--- a/databases/sqsh/Makefile
+++ b/databases/sqsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/05/22 05:28:23 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2001/05/24 08:53:55 jlam Exp $
 
 DISTNAME=	sqsh-1.7-src
 PKGNAME=	sqsh-1.7
@@ -22,12 +22,12 @@ CONFIGURE_ENV+=		SYBASE="${SYBASE}"
 SYBASE=			${PREFIX}/freetds
 LDFLAGS+=		-Wl,-R${SYBASE}/lib
 
-.include "../../devel/readline/Makefile.readline"
+.include "../../devel/readline/buildlink.mk"
 
-LDFLAGS+=		-L${WRKLIBDIR}
-CONFIGURE_ENV+=		INCDIRS="${WRKINCDIR}"
-CONFIGURE_ENV+=		LIBDIRS="${WRKLIBDIR}"
+LDFLAGS+=		-L${BUILDLINK_LIBDIR}
+CONFIGURE_ENV+=		INCDIRS="${BUILDLINK_INCDIR}"
+CONFIGURE_ENV+=		LIBDIRS="${BUILDLINK_LIBDIR}"
 
-pre-configure: link-readline-headers link-readline-libs
+pre-configure: ${BUILDLINK_TARGETS}
 
 .include "../../mk/bsd.pkg.mk"