Fix up some small problems with pathname replacement: 1) replace the bare 'sed' with $(SED) 2) '\@' is apparently not portable, so we need to use a different scheme in case we end up using a non-typical sed binary. 3) do the sed conversion to a new file and then move it into place. If sed falls down halfway through the conversion we could end up with a half-baked manpage. 4) use the $@ construct for brevity and maintainability 5) add a comment so that the rationale behind this is explained Many thanks to several folks inside Red Hat who pointed out these issues. Signed-off-by: Jeff Layton <jlayton@xxxxxxxxx> --- Makefile.am | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index cbfa846..67a0190 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,11 +14,15 @@ cifs_upcall_SOURCES = cifs.upcall.c data_blob.c asn1.c spnego.c util.c cifs_upcall_LDADD = -ltalloc -lkeyutils $(KRB5_LDADD) man_MANS += cifs.upcall.8 +# +# Fix the pathnames in manpages. To prevent @label@ being replaced by m4, we +# need to obfuscate the LHS of the regex (hence the trivial one character set). +# cifs.upcall.8: cifs.upcall.8.in - sed 's,\@sbindir\@,$(sbindir),' < $(srcdir)/cifs.upcall.8.in > cifs.upcall.8 + $(SED) 's,[@]sbindir@,$(sbindir),' $(srcdir)/$@.in > $@-t && mv $@-t $@ clean-local: - rm -f cifs.upcall.8 + rm -f cifs.upcall.8 cifs.upcall.8-t endif if CONFIG_CIFSCREDS -- 1.7.3.2 -- To unsubscribe from this list: send the line "unsubscribe linux-cifs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
