Merge remote-tracking branch 'github/pr/392'.

johu · Nov 25, 2015 · c9fde06 · c9fde06
1 parent efc22f9
commit c9fde06
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 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
@@ -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
@@ -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
 }