The buildlink include and lib directories are added to CFLAGS, CPPFLAGS,

CXXFLAGS, and LDFLAGS by the buildlink.mk files so remove the extra
definitions to add them from the package Makefiles.  As advised by the
bsd.buildlink.mk file, also ensure that the buildlink.mk files are
included prior to defining any package-specific CFLAGS/LDFLAGS to ensure
that the buildlink directories are at the head of the compiler search
paths.

4 files changed, 20 insertions, 23 deletions

diff --git a/databases/postgresql-client/Makefile b/databases/postgresql-client/Makefile
index 2889e342105..47526ce239d 100644
--- a/databases/postgresql-client/Makefile
+++ b/databases/postgresql-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/06/10 00:08:42 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2001/06/11 02:05:08 jlam Exp $
 
 .include "../../databases/postgresql/Makefile.common"
 .include "../../databases/postgresql/Makefile.ssl"
@@ -16,6 +16,13 @@ CONFIGURE_ARGS+=	--enable-readline
 
 DIRS_TO_BUILD=		src/bin
 
+# The following is a hack to force ${BUILDLINK_DIR}/lib 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${BUILDLINK_DIR}/lib
+
 pre-build:
 	cd ${WRKSRC}/src/bin/psql &&					\
 		${RM} -f pqsignal.h &&					\
diff --git a/databases/postgresql-server/Makefile b/databases/postgresql-server/Makefile
index 37d140edb74..c267ca1753e 100644
--- a/databases/postgresql-server/Makefile
+++ b/databases/postgresql-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/06/10 00:08:42 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/06/11 02:05:09 jlam Exp $
 
 .include "../../databases/postgresql/Makefile.common"
 .include "../../databases/postgresql/Makefile.ssl"
@@ -15,6 +15,13 @@ NOT_FOR_PLATFORM=	*-*-mips
 
 DIRS_TO_BUILD=		src/backend
 
+# The following is a hack to force ${BUILDLINK_DIR}/lib 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${BUILDLINK_DIR}/lib
+
 # PGUSER	username of the database administrator
 # PGGROUP	group of the database administrator
 # PGHOME	home directory of the database administrator and location of
diff --git a/databases/postgresql/Makefile.common b/databases/postgresql/Makefile.common
index f5bfd9d30c2..feb35a49a81 100644
--- a/databases/postgresql/Makefile.common
+++ b/databases/postgresql/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2001/05/29 23:28:05 jlam Exp $
+# $NetBSD: Makefile.common,v 1.19 2001/06/11 02:05:08 jlam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution.
@@ -79,23 +79,7 @@ CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
 CONFIGURE_ENV+=		LIBS="${LIBS}"
 MAKE_ENV+=		CUSTOM_COPT="${CFLAGS}"
 
-BUILDLINK_INCDIR=	${WRKDIR}/include
-BUILDLINK_LIBDIR=	${WRKDIR}/lib
-
-CPPFLAGS+=		-I${BUILDLINK_INCDIR}
-CFLAGS+=		-I${BUILDLINK_INCDIR}
-LDFLAGS+=		-L${BUILDLINK_LIBDIR}
-
-# 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${BUILDLINK_LIBDIR}
-
 post-extract:
-	${MKDIR} ${BUILDLINK_INCDIR}
-	${MKDIR} ${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 882b4ab7572..469b1c268ec 100644
--- a/databases/sqsh/Makefile
+++ b/databases/sqsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/06/10 00:08:43 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/06/11 02:05:09 jlam Exp $
 
 DISTNAME=	sqsh-1.7-src
 PKGNAME=	sqsh-1.7
@@ -24,8 +24,7 @@ LDFLAGS+=		-Wl,-R${SYBASE}/lib
 
 .include "../../devel/readline/buildlink.mk"
 
-LDFLAGS+=		-L${BUILDLINK_LIBDIR}
-CONFIGURE_ENV+=		INCDIRS="${BUILDLINK_INCDIR}"
-CONFIGURE_ENV+=		LIBDIRS="${BUILDLINK_LIBDIR}"
+CONFIGURE_ENV+=		INCDIRS="${BUILDLINK_DIR}/include"
+CONFIGURE_ENV+=		LIBDIRS="${BUILDLINK_DIR}/lib"
 
 .include "../../mk/bsd.pkg.mk"