From fedcaf873e4d08741407c7be1db8c2d73dcc1241 Mon Sep 17 00:00:00 2001 From: Stef Walter Date: Tue, 9 Aug 2016 16:46:49 +0200 Subject: doc: Fix interpolation of p11-kit configuration paths in documentation Previously these were expanded based on the home directory of the one building the documentation (me). --- doc/manual/Makefile.am | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/doc/manual/Makefile.am b/doc/manual/Makefile.am index c3dfe2a..c161b19 100644 --- a/doc/manual/Makefile.am +++ b/doc/manual/Makefile.am @@ -110,11 +110,11 @@ $(builddir)/p11-kit-overrides.txt: $(srcdir)/p11-kit-overrides.txt # Generate our files with variables sysdir.xml: - $(AM_V_GEN) echo -n $(p11_system_config) > "$@" + $(AM_V_GEN) echo -n '$(p11_system_config)' > "$@" userdir.xml: - $(AM_V_GEN) echo -n $(p11_user_config) > "$@" + $(AM_V_GEN) echo -n '$(p11_user_config)' > "$@" version.xml: - $(AM_V_GEN) echo -n $(VERSION) > "$@" + $(AM_V_GEN) echo -n '$(VERSION)' > "$@" # This includes the standard gtk-doc make rules, copied by gtkdocize. include $(top_srcdir)/build/gtk-doc.make @@ -158,6 +158,7 @@ MAN_IN_FILES = \ $(NULL) CLEANFILES += \ + $(generate_files) \ $(man1_MANS) \ $(man5_MANS) \ $(man8_MANS) \ @@ -165,7 +166,4 @@ CLEANFILES += \ EXTRA_DIST += \ $(MAN_IN_FILES) \ - sysdir.xml \ - userdir.xml \ - version.xml \ $(NULL) -- cgit v1.1