krb5 commit: Fix Makefile for paths containing '+' character

[Greg Hudson]

https://github.com/krb5/krb5/commit/cf872b9f25955ea2d51589a094df3a78fb582a6d
commit cf872b9f25955ea2d51589a094df3a78fb582a6d
Author: Dmitry Kalinkin <dkalinkin at bnl.gov>
Date:   Fri Jun 17 13:52:23 2016 -0400

    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)

 src/include/Makefile.in |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/include/Makefile.in b/src/include/Makefile.in
index 4bb11e4..cb4b44b 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+ at KRB5RCTMPDIR+$(KRB5RCTMPDIR)+" \
-		  -e "s+ at PREFIX+$(INSTALL_PREFIX)+" \
-		  -e "s+ at EXEC_PREFIX+$(INSTALL_EXEC_PREFIX)+" \
-		  -e "s+ at BINDIR+$(BINDIR)+" \
-		  -e "s+ at LIBDIR+$(LIBDIR)+" \
-		  -e "s+ at SBINDIR+$(SBINDIR)+" \
-		  -e "s+ at MODULEDIR+$(MODULE_DIR)+" \
-		  -e "s+ at GSSMODULEDIR+$(GSS_MODULE_DIR)+" \
-		  -e 's+ at LOCALSTATEDIR+$(LOCALSTATEDIR)+' \
-		  -e 's+ at RUNSTATEDIR+$(RUNSTATEDIR)+' \
-		  -e 's+ at SYSCONFDIR+$(SYSCONFDIR)+' \
-		  -e 's+ at DYNOBJEXT+$(DYNOBJEXT)+' \
-		  -e 's+ at 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