Fix 2 minor bugs:

- the tzdata DESTDIR should not be tzdata, because some package managers use
$PACKAGE as their working directory, and this may conflicts with this one.
tzdata DESTDIR is now 001-tzdata
- when reading md5sums, the current code assumes that there is only one
<para><literal> node reachable from ../.. (relative to <ulink>). This is true
for the "official" book, but not necessarily for the snippets written for
package management. The following change only assumes that the md5sum
<para><literal> for a given <ulink> is the first one after <para><ulink>,
which does not change anything for the book, and is better for user
written snippets.
This commit is contained in:
Pierre Labastie 2014-12-21 11:25:47 +00:00
parent b9c3497abb
commit 56d842655b
2 changed files with 2 additions and 2 deletions

View file

@ -455,7 +455,7 @@ exit
<xsl:text> <xsl:text>
OLD_PKG_DEST=$PKG_DEST OLD_PKG_DEST=$PKG_DEST
OLD_PKGDIR=$PKGDIR OLD_PKGDIR=$PKGDIR
PKG_DEST=$(dirname $OLD_PKG_DEST)/tzdata PKG_DEST=$(dirname $OLD_PKG_DEST)/001-tzdata
PKGDIR=$(dirname $PKGDIR)/tzdata-</xsl:text> PKGDIR=$(dirname $PKGDIR)/tzdata-</xsl:text>
<xsl:copy-of select="substring-before( <xsl:copy-of select="substring-before(
substring-after(string(),'tzdata'), substring-after(string(),'tzdata'),

View file

@ -109,7 +109,7 @@
<xsl:value-of select="$package"/> <xsl:value-of select="$package"/>
<!-- Write MD5SUM value --> <!-- Write MD5SUM value -->
<xsl:text> </xsl:text> <xsl:text> </xsl:text>
<xsl:value-of select="../..//para/literal"/> <xsl:value-of select="../following-sibling::para/literal"/>
<xsl:text>&#x0a;</xsl:text> <xsl:text>&#x0a;</xsl:text>
</xsl:if> </xsl:if>
</xsl:template> </xsl:template>