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).

diff --git a/doc/manual/Makefile.am b/doc/manual/Makefile.am
index c3dfe2a1c9ca05f14ed04acbecad293306b7de5a..c161b1945363484688e6a77d0db548d4da5194c8 100644 (file)
--- 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)