diff options
| author | jlam <jlam@pkgsrc.org> | 2001-08-22 04:29:55 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-08-22 04:29:55 +0000 |
| commit | 14bff9af55bb9768d83eab27cc036a2829624c4a (patch) | |
| tree | 5f354c2c56d7b0f1f31c16900ad5948bfa034c96 /mk | |
| parent | 461b9e5d2a244dc8408a7cc7840c26f82736a5e9 (diff) | |
| download | pkgsrc-14bff9af55bb9768d83eab27cc036a2829624c4a.tar.gz | |
Change a = to a += to allow adding to the value of
BUILDLINK_CONFIG_WRAPPER_POST_SED. Also some minor formatting changes.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.buildlink.mk | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/mk/bsd.buildlink.mk b/mk/bsd.buildlink.mk index af421824ec6..e079a688eac 100644 --- a/mk/bsd.buildlink.mk +++ b/mk/bsd.buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink.mk,v 1.29 2001/07/27 16:51:30 jlam Exp $ +# $NetBSD: bsd.buildlink.mk,v 1.30 2001/08/22 04:29:55 jlam Exp $ # # This Makefile fragment is included by package buildlink.mk files. This # file does the following things: @@ -97,6 +97,7 @@ LDFLAGS:= ${BUILDLINK_LDFLAGS} ${LDFLAGS} CONFIGURE_ENV+= BUILDLINK_DIR="${BUILDLINK_DIR}" CONFIGURE_ENV+= BUILDLINK_CPPFLAGS="${BUILDLINK_CPPFLAGS}" CONFIGURE_ENV+= BUILDLINK_LDFLAGS="${BUILDLINK_LDFLAGS}" + MAKE_ENV+= BUILDLINK_DIR="${BUILDLINK_DIR}" MAKE_ENV+= BUILDLINK_CPPFLAGS="${BUILDLINK_CPPFLAGS}" MAKE_ENV+= BUILDLINK_LDFLAGS="${BUILDLINK_LDFLAGS}" @@ -145,9 +146,9 @@ USE_CONFIG_WRAPPER= # defined .endif BUILDLINK_CONFIG_WRAPPER_SED?= # empty -BUILDLINK_CONFIG_WRAPPER_POST_SED= \ - -e "s|-I${LOCALBASE}/|-I${BUILDLINK_DIR}/|g" \ - -e "s|-L${LOCALBASE}/|-L${BUILDLINK_DIR}/|g" +BUILDLINK_CONFIG_WRAPPER_POST_SED+= \ + -e "s|-I${LOCALBASE}/|-I${BUILDLINK_DIR}/|g" \ + -e "s|-L${LOCALBASE}/|-L${BUILDLINK_DIR}/|g" _BUILDLINK_CONFIG_WRAPPER_USE: .USE ${_PKG_SILENT}${_PKG_DEBUG} \ @@ -244,8 +245,9 @@ REPLACE_BUILDLINK+= \ post-build: replace-buildlink REPLACE_BUILDLINK_SED?= # empty -REPLACE_BUILDLINK_POST_SED+= -e "s|-I${BUILDLINK_DIR}/|-I${LOCALBASE}/|g" -REPLACE_BUILDLINK_POST_SED+= -e "s|-L${BUILDLINK_DIR}/|-L${LOCALBASE}/|g" +REPLACE_BUILDLINK_POST_SED+= \ + -e "s|-I${BUILDLINK_DIR}/|-I${LOCALBASE}/|g" \ + -e "s|-L${BUILDLINK_DIR}/|-L${LOCALBASE}/|g" # Fix files by removing buildlink directory references. replace-buildlink: |