summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorsalo <salo@pkgsrc.org>2004-06-23 11:42:18 +0000
committersalo <salo@pkgsrc.org>2004-06-23 11:42:18 +0000
commit97a5956635c99c8688a85c6017f60cb919bd20a2 (patch)
tree01c198f5f193576a750dcb41ea5a643cbfa8cae7 /mk
parenta957b1f62df451bf1f28ad2d72a9f30213a2ac9d (diff)
downloadpkgsrc-97a5956635c99c8688a85c6017f60cb919bd20a2.tar.gz
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.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index aa09050e7fa..e5f848792ff 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1469 2004/06/23 11:13:12 cjep Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1470 2004/06/23 11:42:18 salo 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)