diff options
| author | jlam <jlam@pkgsrc.org> | 2005-05-10 01:34:04 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2005-05-10 01:34:04 +0000 |
| commit | bcf049a400cf3c6ea918bfa1fd5d180860c81307 (patch) | |
| tree | 82b855157c38db71dab4771c6f62e9f691c676d7 | |
| parent | 23b8c7915d5d72000fba755df431d30191d0e272 (diff) | |
| download | pkgsrc-bcf049a400cf3c6ea918bfa1fd5d180860c81307.tar.gz | |
In make variables, quotes protect embedded whitespace in words, so we
can replace :C/^ *//:C/ *$// with :M* to get the same effect -- removing
leading and trailing whitespace and extra spaces between words.
| -rw-r--r-- | mk/bsd.pkg.mk | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index f4d26c2635d..99568313412 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1631 2005/05/09 05:06:55 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1632 2005/05/10 01:34:04 jlam Exp $ # # This file is in the public domain. # @@ -312,14 +312,14 @@ ${_var_}+= ${${_var_}.*} CPPFLAGS+= ${CPP_PRECOMP_FLAGS} ALL_ENV+= CC=${CC:Q} -ALL_ENV+= CFLAGS=${CFLAGS:C/^ *//:C/ *$//:Q} -ALL_ENV+= CPPFLAGS=${CPPFLAGS:C/^ *//:C/ *$//:Q} -ALL_ENV+= CXX=${CXX:C/^ *//:C/ *$//:Q} -ALL_ENV+= CXXFLAGS=${CXXFLAGS:C/^ *//:C/ *$//:Q} +ALL_ENV+= CFLAGS=${CFLAGS:M*:Q} +ALL_ENV+= CPPFLAGS=${CPPFLAGS:M*:Q} +ALL_ENV+= CXX=${CXX:M*:Q} +ALL_ENV+= CXXFLAGS=${CXXFLAGS:M*:Q} ALL_ENV+= COMPILER_RPATH_FLAG=${COMPILER_RPATH_FLAG:Q} ALL_ENV+= F77=${FC:Q} ALL_ENV+= FC=${FC:Q} -ALL_ENV+= FFLAGS=${FFLAGS:C/^ *//:C/ *$//:Q} +ALL_ENV+= FFLAGS=${FFLAGS:M*:Q} ALL_ENV+= LANG=C ALL_ENV+= LC_COLLATE=C ALL_ENV+= LC_CTYPE=C @@ -327,7 +327,7 @@ ALL_ENV+= LC_MESSAGES=C ALL_ENV+= LC_MONETARY=C ALL_ENV+= LC_NUMERIC=C ALL_ENV+= LC_TIME=C -ALL_ENV+= LDFLAGS=${LDFLAGS:C/^ *//:C/ *$//:Q} +ALL_ENV+= LDFLAGS=${LDFLAGS:M*:Q} ALL_ENV+= LINKER_RPATH_FLAG=${LINKER_RPATH_FLAG:Q} ALL_ENV+= PATH=${PATH:Q}:${LOCALBASE}/bin:${X11BASE}/bin ALL_ENV+= PREFIX=${PREFIX} @@ -425,7 +425,7 @@ _ULIMIT_CMD+= ${ULIMIT_CMD_${__tmp__}} ; .if defined(GNU_CONFIGURE) CONFIG_SHELL?= ${SH} CONFIGURE_ENV+= CONFIG_SHELL=${CONFIG_SHELL} -CONFIGURE_ENV+= LIBS=${LIBS:C/^ *//:C/ *$//:Q} +CONFIGURE_ENV+= LIBS=${LIBS:M*:Q} CONFIGURE_ENV+= install_sh=${INSTALL:Q} . if defined(USE_LIBTOOL) && defined(_OPSYS_MAX_CMDLEN_CMD) CONFIGURE_ENV+= lt_cv_sys_max_cmd_len=${_OPSYS_MAX_CMDLEN_CMD:sh} |