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 /lang | |
| 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 'lang')
| -rw-r--r-- | lang/guile/Makefile | 6 | ||||
| -rw-r--r-- | lang/hugs/Makefile | 4 | ||||
| -rw-r--r-- | lang/librep/Makefile | 9 |
3 files changed, 5 insertions, 14 deletions
diff --git a/lang/guile/Makefile b/lang/guile/Makefile index 1134ebf92b3..d644d166723 100644 --- a/lang/guile/Makefile +++ b/lang/guile/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2001/06/10 00:08:45 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2001/06/11 02:05:11 jlam Exp $ # FreeBSD Id: Makefile,v 1.12 1997/11/22 16:01:32 jseger Exp # @@ -21,8 +21,4 @@ USE_GNU_READLINE= # defined INFO_FILES= data-rep.info .include "../../devel/readline/buildlink.mk" - -CFLAGS+= -I${BUILDLINK_INCDIR} -LDFLAGS+= -L${BUILDLINK_LIBDIR} - .include "../../mk/bsd.pkg.mk" diff --git a/lang/hugs/Makefile b/lang/hugs/Makefile index 1ab1b2ec74d..00a1018486a 100644 --- a/lang/hugs/Makefile +++ b/lang/hugs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2001/06/10 00:08:45 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2001/06/11 02:05:12 jlam Exp $ DISTNAME= hugs98-Feb2000 PKGNAME= hugs98-200002 @@ -22,8 +22,6 @@ CONFIGURE_ENV+= ac_cv_lib_ncurses_main=no # .include "../../devel/readline/buildlink.mk" -LDFLAGS+= -L${BUILDLINK_LIBDIR} - do-build: @cd ${WRKSRC}/.. && ${SETENV} ${MAKE_ENV} \ ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} ${ALL_TARGET} diff --git a/lang/librep/Makefile b/lang/librep/Makefile index dc697da3379..e17829fc2ca 100644 --- a/lang/librep/Makefile +++ b/lang/librep/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/06/10 00:08:45 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2001/06/11 02:05:12 jlam Exp $ # DISTNAME= librep-${REP_VERS} @@ -22,14 +22,11 @@ CONFIGURE_ARGS+= --with-readline CONFIGURE_ARGS+= --with-gmp CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" +PLIST_SUBST+= REP_VERS=${REP_VERS} + .include "../../databases/gdbm/buildlink.mk" .include "../../devel/gettext-lib/buildlink.mk" .include "../../devel/gmp/buildlink.mk" .include "../../devel/readline/buildlink.mk" -CPPFLAGS+= -I${BUILDLINK_INCDIR} -LDFLAGS+= -L${BUILDLINK_LIBDIR} - -PLIST_SUBST+= REP_VERS=${REP_VERS} - .include "../../mk/bsd.pkg.mk" |