diff options
| author | agc <agc@pkgsrc.org> | 2004-07-06 22:15:54 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 2004-07-06 22:15:54 +0000 |
| commit | fa3f880e59b7b60204f64a68a65bb4bcfb554bc5 (patch) | |
| tree | af73e2b5d6d27a498af7dc83d75c2704abb25bbb /mk | |
| parent | a87a8b809ae2f41856440c4e7f0366ca3491ff59 (diff) | |
| download | pkgsrc-fa3f880e59b7b60204f64a68a65bb4bcfb554bc5.tar.gz | |
Pullup ticket 40 to the pkgsrc-2004Q2 branch, requested by Grant Beattie.
Module Name: pkgsrc
Committed By: salo
Date: Wed Jun 23 11:42:18 UTC 2004
Modified Files:
pkgsrc/mk: bsd.pkg.mk
Log Message:
In SUBST_SED.pkglocaledir, escape the rest of the line in the pattern.
Saves trailing \ properly.
Addresses PR pkg/26022 by Akio OBATA.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index d6e9be56095..0c84b8cd2eb 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1468.2.1 2004/07/06 22:11:59 agc Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1468.2.2 2004/07/06 22:15:54 agc Exp $ # # This file is in the public domain. # @@ -2123,7 +2123,7 @@ SUBST_FILES.pkglocaledir= ${_REPLACE_LOCALEDIR} SUBST_SED.pkglocaledir= \ -e 's|^\(localedir[ :]*=\).*|\1 ${_PKGLOCALEDIR}|' \ -e 's|^\(gnulocaledir[ :]*=\).*|\1 ${_PKGLOCALEDIR}|' \ - -e 's|\(-DLOCALEDIR[ ]*=\)[^ ]*\(.*\)|\1"\\"${_PKGLOCALEDIR}\\""\2|' + -e 's|\(-DLOCALEDIR[ ]*=\)[^ ]*\(\.\*\)|\1"\\"${_PKGLOCALEDIR}\\""\2|' .endif .if defined(REPLACE_PERL) |