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 faf4f025e639d8ee6b01e07c24e20babbfdbd5be..15c08a1fd92ed8b7e65df5e419c8cfb1e69bcebe 100644 (file)
--- 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 d3db3085ffbd87aed915d87a8995582e3e01c1e7..673d8b3eeecd179897293eabcf7881f3370d324e 100644 (file)
--- 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 | \