diff options
| author | Paul W. Frields <stickster@gmail.com> | 2006-07-15 15:20:46 +0000 |
|---|---|---|
| committer | Paul W. Frields <stickster@gmail.com> | 2006-07-15 15:20:46 +0000 |
| commit | 6e7ee5aa90df41e9c8efa6d42c790747cfe92c67 (patch) | |
| tree | 728081ec2d813c6af6920ef771d4bd94a3362b39 | |
| parent | ecd77d697ed1318d3c7a1d7fdd4162df6a8aad04 (diff) | |
| download | fedora-doc-utils-6e7ee5aa90df41e9c8efa6d42c790747cfe92c67.tar.gz fedora-doc-utils-6e7ee5aa90df41e9c8efa6d42c790747cfe92c67.tar.xz fedora-doc-utils-6e7ee5aa90df41e9c8efa6d42c790747cfe92c67.zip | |
Allow legalnotice hacks in a more make-friendly way when necessary, since relnotes may not be the only document in need.
| -rw-r--r-- | Makefile.common | 8 | ||||
| -rw-r--r-- | packaging/bookinfo.xsl | 8 |
2 files changed, 11 insertions, 5 deletions
diff --git a/Makefile.common b/Makefile.common index 675b39c..83b370a 100644 --- a/Makefile.common +++ b/Makefile.common @@ -116,6 +116,9 @@ endif ifeq "${XMLLINTOPT}" "" XMLLINTOPT =--xinclude --postvalid --noent endif +ifeq "${LEGALNOTICEBASE}" "" +LEGALNOTICEBASE =legalnotice-opl +endif ######################################################################### ######################################################################### @@ -633,8 +636,9 @@ $(1)/fdp-info.xml:: $(RPMINFO) LANG=$(1).UTF-8 ${XSLTPROC} --stringparam lang $(1) \ --stringparam fdpdir $(FDPDIR) \ --stringparam doctype $(shell \ - doctype ${PRI_LANG}/$(DOCBASE).xml \ - ) ${FDPDIR}/docs-common/packaging/bookinfo.xsl \ + doctype ${PRI_LANG}/$(DOCBASE).xml) \ + --stringparam legalbase ${LEGALNOTICEBASE} \ + ${FDPDIR}/docs-common/packaging/bookinfo.xsl \ $(RPMINFO) | \ $(XMLFORMAT) $(XMLFOPTS) >$$@ diff --git a/packaging/bookinfo.xsl b/packaging/bookinfo.xsl index 7c99fc1..884129a 100644 --- a/packaging/bookinfo.xsl +++ b/packaging/bookinfo.xsl @@ -5,6 +5,7 @@ <xsl:param name="doctype" select="'bookinfo'"/> <xsl:param name="who" select="''"/> <xsl:param name="fdpdir" select="'../..'"/> + <xsl:param name="legalbase" select="'legalnotice-opl'"/> <xsl:output encoding="UTF-8" indent="yes" method="xml" omit-xml-declaration="no" version="1.0" @@ -87,9 +88,10 @@ <xsl:when test="/rpm-info/license/rights='OPL'"> <xsl:element name="xi:include" namespace="http://www.w3.org/2001/XInclude"><xsl:attribute - name="href"><xsl:value-of - select="$fdpdir"/>/docs-common/common/legalnotice-opl-<xsl:value-of - select="$lang"/>.xml</xsl:attribute></xsl:element> + name="href"><xsl:value-of + select="$fdpdir"/>/docs-common/common/<xsl:value-of + select="$legalbase"/>-<xsl:value-of + select="$lang"/>.xml</xsl:attribute></xsl:element> </xsl:when> <xsl:otherwise> <!-- assume OPL for now --> <xsl:element name="xi:include" |