Skip to content

Commit

Permalink
Fix generation of pkcs15-profile documentation
Browse files Browse the repository at this point in the history
  • Loading branch information
xhanulik committed May 22, 2024
1 parent cda053d commit 94c23f9
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 4 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ doc/tools/pkcs15-init
doc/tools/opensc-asn1
doc/tools/opensc-notify
doc/files/opensc.conf.5.xml
doc/files/pkcs15-profile.5.xml

etc/opensc.conf.example
src/common/compat_getopt_main
Expand Down
12 changes: 9 additions & 3 deletions doc/files/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in

dist_noinst_DATA = pkcs15-profile.5.xml opensc.conf.5.xml.in files.xml
dist_noinst_DATA = pkcs15-profile.5.xml.in opensc.conf.5.xml.in files.xml
if ENABLE_DOC
html_DATA = files.html
endif
Expand All @@ -21,12 +21,18 @@ opensc.conf.5.xml opensc.conf.5: $(srcdir)/opensc.conf.5.xml.in
< $< > opensc.conf.5.xml
$(AM_V_GEN)$(XSLTPROC) --nonet --path "$(srcdir)/..:$(xslstylesheetsdir)/manpages" --xinclude -o $@ man.xsl opensc.conf.5.xml 2>/dev/null

files.html: $(srcdir)/files.xml $(wildcard $(srcdir)/*.5.xml) opensc.conf.5.xml
pkcs15-profile.5.xml pkcs15-profile.5: $(srcdir)/pkcs15-profile.5.xml.in
@sed \
-e 's|@pkgdatadir[@]|$(pkgdatadir)|g' \
< $< > pkcs15-profile.5.xml
$(AM_V_GEN)$(XSLTPROC) --nonet --path "$(srcdir)/..:$(xslstylesheetsdir)/manpages" --xinclude -o $@ man.xsl pkcs15-profile.5.xml 2>/dev/null

files.html: $(srcdir)/files.xml $(wildcard $(srcdir)/*.5.xml) opensc.conf.5.xml pkcs15-profile.5.xml
$(AM_V_GEN)$(XSLTPROC) --nonet --path "$(builddir):$(srcdir)/..:$(xslstylesheetsdir)/html" --xinclude -o $@ html.xsl $< 2>/dev/null

%.5: $(srcdir)/%.5.xml
$(AM_V_GEN)sed -e 's|@pkgdatadir[@]|$(pkgdatadir)|g' < $< \
| $(XSLTPROC) --nonet --path "$(srcdir)/..:$(xslstylesheetsdir)/manpages" --xinclude -o $@ man.xsl - 2>/dev/null

clean-local:
-rm -rf $(html_DATA) $(man5_MANS) opensc.conf.5.xml
-rm -rf $(html_DATA) $(man5_MANS) *.5.xml
2 changes: 1 addition & 1 deletion doc/files/files.html
Original file line number Diff line number Diff line change
Expand Up @@ -1231,7 +1231,7 @@
</p><p>
The card specific profile contains additional information required during
card initialization, such as location of PIN files, key references etc.
Profiles currently reside in <code class="filename">@pkgdatadir@</code>
Profiles currently reside in <code class="filename">/usr/share/opensc</code>
</p><p>
Basic PKCS#15 terminology:
</p><div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><p>
Expand Down
File renamed without changes.

0 comments on commit 94c23f9

Please sign in to comment.