diff options
| author | Patrice Clement <monsieurp@gentoo.org> | 2015-11-25 08:39:19 +0000 |
|---|---|---|
| committer | Patrice Clement <monsieurp@gentoo.org> | 2015-11-25 08:43:19 +0000 |
| commit | c9fde0661308f1686a8d88065293e20f36745939 (patch) | |
| tree | 4b8d8af207fa16a479ad44440527fe9497bad977 /app-text | |
| parent | efc22f9b89d664fc4d2bb340fb887d62d27b63ed (diff) | |
| download | gentoo-c9fde0661308f1686a8d88065293e20f36745939.tar.gz gentoo-c9fde0661308f1686a8d88065293e20f36745939.tar.xz | |
Merge remote-tracking branch 'github/pr/392'.
Diffstat (limited to 'app-text')
| -rw-r--r-- | app-text/linuxdoc-tools/linuxdoc-tools-0.9.69.ebuild | 2 | ||||
| -rw-r--r-- | app-text/linuxdoc-tools/linuxdoc-tools-0.9.71-r1.ebuild | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.69.ebuild b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.69.ebuild index 11654a737f9..ad31ecac4a5 100644 --- a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.69.ebuild +++ b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.69.ebuild @@ -51,7 +51,7 @@ src_prepare() { # Fix doc install path. sed -e \ "s%/share/doc/linuxdoc-tools%/share/doc/${PF}%" \ - -i Makefile.in + -i Makefile.in || die # Upstream developers unconditionally build docs during the install phase. # The only sane solution in this case is to patch things out from Makefile. diff --git a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.71-r1.ebuild b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.71-r1.ebuild index b45639cc35f..b9883e767e8 100644 --- a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.71-r1.ebuild +++ b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.71-r1.ebuild @@ -39,14 +39,13 @@ DOCS=( ChangeLog README ) S="${WORKDIR}/${PN}-upstream/${PV}-${GIT_SHA1}" -sgml-catalog_cat_include "/etc/sgml/linuxdoc.cat" \ - "/usr/share/linuxdoc-tools/linuxdoc-tools.catalog" +sgml-catalog_cat_include "/etc/sgml/linuxdoc.cat" "/usr/share/${PN}/${PN}.catalog" src_prepare() { # Use Gentoo doc install path. sed -i \ -e "s%/share/doc/linuxdoc-tools%/share/doc/${PF}%" \ - Makefile.in + Makefile.in || die autotools-utils_src_prepare } |