From: Joey Pabalinas <joeypabalinas@gmail.com>
Date: Mon, 1 Oct 2018 21:30:59 +0000 (-1000)
Subject: build: make samples reflect the provided libexecdir in ./configure
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2249966410400273f1ae4f7b73ce3f33ac40ca57;p=neomutt

build: make samples reflect the provided libexecdir in ./configure

The /usr/libexec path is hardcoded in some of the samples. Run
sed on the installed versions to reflect the directory provided
in ./configure.

Fixes issue #1350

Signed-off-by: Joey Pabalinas <joeypabalinas@gmail.com>
---

diff --git a/contrib/Makefile.autosetup b/contrib/Makefile.autosetup
index faf4f025e..15c08a1fd 100644
--- a/contrib/Makefile.autosetup
+++ b/contrib/Makefile.autosetup
@@ -10,7 +10,9 @@ clean-contrib:
 install-contrib:
 	$(INSTALL) -d -m 755 $(DESTDIR)$(docdir)/samples
 	for f in $(SAMPLES); do \
-		$(INSTALL) -m 644 $(SRCDIR)/contrib/$$f $(DESTDIR)$(docdir)/samples || exit 1; \
+		sed -e 's!/usr/libexec!$(libexecdir)!g' $(SRCDIR)/contrib/$$f > $(SRCDIR)/contrib/$$f.tmp; \
+		$(INSTALL) -m 644 $(SRCDIR)/contrib/$$f.tmp $(DESTDIR)$(docdir)/samples/$$f || exit 1; \
+		rm -f -- $(SRCDIR)/contrib/$$f.tmp; \
 	done
 	for d in $(CONTRIB_DIRS); do \
 		echo "Creating directory $(DESTDIR)$(docdir)/$$d"; \
diff --git a/doc/Makefile.autosetup b/doc/Makefile.autosetup
index d3db3085f..673d8b3ee 100644
--- a/doc/Makefile.autosetup
+++ b/doc/Makefile.autosetup
@@ -85,7 +85,7 @@ doc/neomutt.1:
 doc/manual.xml:	doc/makedoc$(EXEEXT) $(SRCDIR)/init.h $(SRCDIR)/opcodes.h \
 		$(SRCDIR)/doc/manual.xml.head $(SRCDIR)/functions.h \
 		$(SRCDIR)/doc/manual.xml.tail $(SRCDIR)/doc/gen-map-doc
-	( sed -e "s/@VERSION@/$(PACKAGE_VERSION)/" \
+	( sed -e "s/@VERSION@/$(PACKAGE_VERSION)/; s!/usr/libexec!$(libexecdir)!g" \
 	    $(SRCDIR)/doc/manual.xml.head && \
 	    $(MAKEDOC_CPP) $(SRCDIR)/init.h | doc/makedoc$(EXEEXT) -s && \
 	    $(MAKEDOC_CPP) $(SRCDIR)/functions.h | \