From: Dmitry Kalinkin <dkalinkin@bnl.gov>
Date: Fri, 17 Jun 2016 17:52:23 +0000 (-0400)
Subject: Fix Makefile for paths containing '+' character
X-Git-Tag: krb5-1.15-beta1~165
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf872b9f25955ea2d51589a094df3a78fb582a6d;p=thirdparty%2Fkrb5.git

Fix Makefile for paths containing '+' character

include/Makefile uses a regex to perform variable substitution with '+'
as the sed delimiter.  Paths containing " are already invalid in this
approach, so it is better to use " as the delimiter instead of any
other rare symbol.

ticket: 8429 (new)
---

diff --git a/src/include/Makefile.in b/src/include/Makefile.in
index 4bb11e4868..cb4b44b57a 100644
--- a/src/include/Makefile.in
+++ b/src/include/Makefile.in
@@ -57,19 +57,19 @@ SBINDIR = @sbindir@
 LIBDIR  = @libdir@
 SYSCONFCONF = @SYSCONFCONF@
 
-PROCESS_REPLACE = -e "s+@KRB5RCTMPDIR+$(KRB5RCTMPDIR)+" \
-		  -e "s+@PREFIX+$(INSTALL_PREFIX)+" \
-		  -e "s+@EXEC_PREFIX+$(INSTALL_EXEC_PREFIX)+" \
-		  -e "s+@BINDIR+$(BINDIR)+" \
-		  -e "s+@LIBDIR+$(LIBDIR)+" \
-		  -e "s+@SBINDIR+$(SBINDIR)+" \
-		  -e "s+@MODULEDIR+$(MODULE_DIR)+" \
-		  -e "s+@GSSMODULEDIR+$(GSS_MODULE_DIR)+" \
-		  -e 's+@LOCALSTATEDIR+$(LOCALSTATEDIR)+' \
-		  -e 's+@RUNSTATEDIR+$(RUNSTATEDIR)+' \
-		  -e 's+@SYSCONFDIR+$(SYSCONFDIR)+' \
-		  -e 's+@DYNOBJEXT+$(DYNOBJEXT)+' \
-		  -e 's+@SYSCONFCONF+$(SYSCONFCONF)+'
+PROCESS_REPLACE = -e "s\"@KRB5RCTMPDIR\"$(KRB5RCTMPDIR)\"" \
+		  -e "s\"@PREFIX\"$(INSTALL_PREFIX)\"" \
+		  -e "s\"@EXEC_PREFIX\"$(INSTALL_EXEC_PREFIX)\"" \
+		  -e "s\"@BINDIR\"$(BINDIR)\"" \
+		  -e "s\"@LIBDIR\"$(LIBDIR)\"" \
+		  -e "s\"@SBINDIR\"$(SBINDIR)\"" \
+		  -e "s\"@MODULEDIR\"$(MODULE_DIR)\"" \
+		  -e "s\"@GSSMODULEDIR\"$(GSS_MODULE_DIR)\"" \
+		  -e "s\"@LOCALSTATEDIR\"$(LOCALSTATEDIR)\"" \
+		  -e "s\"@RUNSTATEDIR\"$(RUNSTATEDIR)\"" \
+		  -e "s\"@SYSCONFDIR\"$(SYSCONFDIR)\"" \
+		  -e "s\"@DYNOBJEXT\"$(DYNOBJEXT)\"" \
+		  -e "s\"@SYSCONFCONF\"$(SYSCONFCONF)\""
 
 OSCONFSRC = $(srcdir)/osconf.hin