From: Russ Allbery <rra@stanford.edu>
Date: Thu, 3 Aug 2006 01:24:37 +0000 (+0000)
Subject: better-dirpath-sed-char-20060802
X-Git-Tag: BP-openafs-windows-kdfs-ifs~1134
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=f260f74ad95402d5484479c9490a334ace7662e9;p=packages%2Fo%2Fopenafs.git

better-dirpath-sed-char-20060802


People might use + in paths.  People might also use " in paths, but if they
do, C doesn't work, so they lose anyway.
---

diff --git a/src/util/Makefile.in b/src/util/Makefile.in
index 308bb6104..0033aebe1 100644
--- a/src/util/Makefile.in
+++ b/src/util/Makefile.in
@@ -99,18 +99,20 @@ ${TOP_LIBDIR}/util.a: util.a
 ${TOP_LIBDIR}/libafsutil.a: util.a
 	${INSTALL_DATA} $? $@
 
+# Use " as the sed boundary character because we lose anyway if that occurs
+# in path names.
 dirpath.h: ${srcdir}/dirpath.hin Makefile
 	( sed \
-		-e "s+@afsconfdir+${afsconfdir}+" \
-		-e "s+@viceetcdir+${viceetcdir}+" \
-		-e "s+@afssrvbindir+${afssrvbindir}+" \
-		-e "s+@afssrvsbindir+${afssrvsbindir}+" \
-		-e "s+@afssrvlibexecdir+${afssrvlibexecdir}+" \
-		-e "s+@afsdbdir+${afsdbdir}+" \
-		-e "s+@afslogsdir+${afslogsdir}+" \
-		-e "s+@afslocaldir+${afslocaldir}+" \
-		-e "s+@afsbackupdir+${afsbackupdir}+" \
-		-e "s+@afsbosconfigdir+${afsbosconfigdir}+" \
+		-e 's"@afsconfdir"${afsconfdir}"' \
+		-e 's"@viceetcdir"${viceetcdir}"' \
+		-e 's"@afssrvbindir"${afssrvbindir}"' \
+		-e 's"@afssrvsbindir"${afssrvsbindir}"' \
+		-e 's"@afssrvlibexecdir"${afssrvlibexecdir}"' \
+		-e 's"@afsdbdir"${afsdbdir}"' \
+		-e 's"@afslogsdir"${afslogsdir}"' \
+		-e 's"@afslocaldir"${afslocaldir}"' \
+		-e 's"@afsbackupdir"${afsbackupdir}"' \
+		-e 's"@afsbosconfigdir"${afsbosconfigdir}"' \
 		${srcdir}/dirpath.hin >dirpath.h.tmp && \
 		if cmp dirpath.h.tmp dirpath.h >/dev/null ; then : ; else \
 		mv dirpath.h.tmp dirpath.h ; fi)