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 /devel | |
| 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 'devel')
| -rw-r--r-- | devel/cdecl/Makefile | 5 | ||||
| -rw-r--r-- | devel/cmdline/Makefile | 6 | ||||
| -rw-r--r-- | devel/rpc2/Makefile | 4 | ||||
| -rw-r--r-- | devel/rvm/Makefile | 5 |
4 files changed, 7 insertions, 13 deletions
diff --git a/devel/cdecl/Makefile b/devel/cdecl/Makefile index 88e52a1ea6b..d1c501f381a 100644 --- a/devel/cdecl/Makefile +++ b/devel/cdecl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/06/10 00:08:43 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2001/06/11 02:05:09 jlam Exp $ # DISTNAME= cdecl-2.5 @@ -16,9 +16,6 @@ ALL_TARGET= cdecl .include "../../devel/readline/buildlink.mk" -CFLAGS+= -I${BUILDLINK_INCDIR} -LDFLAGS+= -L${BUILDLINK_LIBDIR} - EGDIR= ${PREFIX}/share/examples/cdecl post-install: diff --git a/devel/cmdline/Makefile b/devel/cmdline/Makefile index f417e4a8261..cd4eb26f0f7 100644 --- a/devel/cmdline/Makefile +++ b/devel/cmdline/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/06/10 00:08:43 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2001/06/11 02:05:09 jlam Exp $ DISTNAME= CmdLine PKGNAME= cmdline-${PKG_VERS} @@ -17,8 +17,8 @@ USE_LIBTOOL= # defined .include "../../devel/readline/buildlink.mk" -MOREUSRDEFS= -I${BUILDLINK_INCDIR}/readline -MOREUSRLIBS= -L${BUILDLINK_LIBDIR} -lreadline -ltermcap +MOREUSRDEFS= -I${BUILDLINK_DIR}/include/readline +MOREUSRLIBS= -L${BUILDLINK_DIR}/lib -lreadline -ltermcap MAKE_ENV+= OPT="${CXXFLAGS}" MAKE_ENV+= MOREUSRDEFS="${MOREUSRDEFS}" diff --git a/devel/rpc2/Makefile b/devel/rpc2/Makefile index 11725e6bb7e..abdd8c72f93 100644 --- a/devel/rpc2/Makefile +++ b/devel/rpc2/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= rpc2-1.10 @@ -24,7 +24,5 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig CONFIGURE_ENV+= ac_cv_search_tgetent="-ltermcap" CONFIGURE_ENV+= PERL=${PERL5} CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" -CPPFLAGS+= -I${BUILDLINK_INCDIR} -LDFLAGS+= -L${BUILDLINK_LIBDIR} .include "../../mk/bsd.pkg.mk" diff --git a/devel/rvm/Makefile b/devel/rvm/Makefile index 2064856ef38..3c0166670f8 100644 --- a/devel/rvm/Makefile +++ b/devel/rvm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/06/10 00:08:43 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2001/06/11 02:05:10 jlam Exp $ # DISTNAME= rvm-1.3 @@ -20,7 +20,6 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig .include "../../devel/lwp/buildlink.mk" -CONFIGURE_ARGS+= --with-lwp-includes=${BUILDLINK_INCDIR} -LDFLAGS+= -L${BUILDLINK_LIBDIR} +CONFIGURE_ARGS+= --with-lwp-includes=${BUILDLINK_DIR}/include .include "../../mk/bsd.pkg.mk" |