Skip to content

Commit

Permalink
build: make samples reflect the provided libexecdir in ./configure
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
alyptik authored and flatcap committed Oct 3, 2018
1 parent e565ea8 commit 2249966
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion contrib/Makefile.autosetup
Expand Up @@ -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"; \
Expand Down
2 changes: 1 addition & 1 deletion doc/Makefile.autosetup
Expand Up @@ -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 | \
Expand Down

0 comments on commit 2249966

Please sign in to comment.