diff options
| author | jlam <jlam> | 2001-06-11 02:05:07 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2001-06-11 02:05:07 +0000 |
| commit | 1c173ba8e2deca49b126f8bd939dadf46f3be360 (patch) | |
| tree | 8a4903fb4961ac3e5118ca00c446b0bcfea9697d /databases/postgresql | |
| parent | fd9688151b15b136e8bb62a77ec3f4c6abf839da (diff) | |
| download | pkgsrc-1c173ba8e2deca49b126f8bd939dadf46f3be360.tar.gz | |
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.
Diffstat (limited to 'databases/postgresql')
| -rw-r--r-- | databases/postgresql/Makefile.common | 18 |
1 files changed, 1 insertions, 17 deletions
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 \ |