diff options
| author |   Maciej Mrozowski <reavertm@gentoo.org> | 2010-09-13 21:23:52 +0000 |
|---|---|---|
| committer | Maciej Mrozowski <reavertm@gentoo.org> | 2010-09-13 21:23:52 +0000 |
| commit | dc30163035d23c83adcf115fa94932d06374f23a (patch) | |
| tree | 7fd74fbf154846147c3f88420aebd7ce852d767d /sys-apps | |
| parent | Stable on alpha, bug #297299 (diff) | |
| download | gentoo-2-dc30163035d23c83adcf115fa94932d06374f23a.tar.gz gentoo-2-dc30163035d23c83adcf115fa94932d06374f23a.tar.bz2 gentoo-2-dc30163035d23c83adcf115fa94932d06374f23a.zip | |
Fix html docs installation, bug 336762. Fix by 'zimous'.
(Portage version: 2.2_rc80/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/dbus/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/dbus/dbus-1.2.24-r2.ebuild | 6 | ||||
| -rw-r--r-- | sys-apps/dbus/dbus-1.4.0.ebuild | 6 |
3 files changed, 13 insertions, 5 deletions
diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog index 37a7da70a327..2804253d933d 100644 --- a/sys-apps/dbus/ChangeLog +++ b/sys-apps/dbus/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/dbus # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.259 2010/09/12 21:45:26 reavertm Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.260 2010/09/13 21:23:52 reavertm Exp $ + + 13 Sep 2010; Maciej Mrozowski <reavertm@gentoo.org> dbus-1.2.24-r2.ebuild, + dbus-1.4.0.ebuild: + Fix html docs installation, bug 336762. Fix by 'zimous'. *dbus-1.4.0 (12 Sep 2010) diff --git a/sys-apps/dbus/dbus-1.2.24-r2.ebuild b/sys-apps/dbus/dbus-1.2.24-r2.ebuild index f6f3d3ef6c4d..aee9b3900a69 100644 --- a/sys-apps/dbus/dbus-1.2.24-r2.ebuild +++ b/sys-apps/dbus/dbus-1.2.24-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.2.24-r2.ebuild,v 1.1 2010/09/09 23:09:05 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.2.24-r2.ebuild,v 1.2 2010/09/13 21:23:52 reavertm Exp $ EAPI="2" @@ -142,7 +142,9 @@ src_install() { # FIXME: split dtd's in dbus-dtd ebuild emake DESTDIR="${D}" install || die "make install failed" if use doc; then - dohtml doc/*.html doc/api/html/* || die "dohtml failed" + dohtml -p api/ doc/api/html/* || die "dohtml api failed" + cd "${S}" + dohtml doc/*.html || die "dohtml failed" fi } diff --git a/sys-apps/dbus/dbus-1.4.0.ebuild b/sys-apps/dbus/dbus-1.4.0.ebuild index 3c0cd3609170..5b65568754b9 100644 --- a/sys-apps/dbus/dbus-1.4.0.ebuild +++ b/sys-apps/dbus/dbus-1.4.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.4.0.ebuild,v 1.1 2010/09/12 21:45:26 reavertm Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.4.0.ebuild,v 1.2 2010/09/13 21:23:52 reavertm Exp $ EAPI="2" @@ -161,7 +161,9 @@ src_install() { # FIXME: split dtd's in dbus-dtd ebuild emake DESTDIR="${D}" install || die "make install failed" if use doc; then - dohtml doc/api/html/* || die "dohtml failed" + dohtml -p api/ doc/api/html/* || die "dohtml api failed" + cd "${S}" + dohtml doc/*.html || die "dohtml failed" fi # Remove .la files |