Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 224519 - dev-util/gtk-doc-1.10-r1 installs extra /usr/share/doc/ directory
Summary: dev-util/gtk-doc-1.10-r1 installs extra /usr/share/doc/ directory
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: New packages (show other bugs)
Hardware: All Linux
: High trivial (vote)
Assignee: Gentoo Linux Gnome Desktop Team
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2008-06-01 19:16 UTC by Chris Mayo
Modified: 2008-06-06 15:00 UTC (History)
0 users

See Also:
Package list:
Runtime testing required: ---


Attachments
fix to xmldocs.make to disambiguate docdir (gtk-doc-1.10-help-files-dir.patch,1.98 KB, patch)
2008-06-02 08:07 UTC, Arun Raghavan (RETIRED)
Details | Diff
patch help/manual/C/Makefile.in (gtk-doc-1.10-docdir.patch,681 bytes, patch)
2008-06-02 17:23 UTC, Chris Mayo
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Chris Mayo 2008-06-01 19:16:28 UTC
gtk-doc-1.10-r1 installs:
/usr/share/doc/gtk-doc/fdl-appendix.xml
/usr/share/doc/gtk-doc/gtk-doc-manual.xml

as well as:
/usr/share/doc/gtk-doc-1.10-r1/


Adding G2CONF="--docdir=/usr/share/doc/${PF}"
to src_compile() fixed this for me.
Comment 1 Arun Raghavan (RETIRED) gentoo-dev 2008-06-01 22:38:16 UTC
Thanks for the investigation. However, from Makefile.in it appears the correct directory might be different:

@ENABLE_SCROLLKEEPER_TRUE@docdir = $(datadir)/gnome/help/$(docname)/$(lang)

I wonder why this isn't being automatically used, though.
Comment 2 Arun Raghavan (RETIRED) gentoo-dev 2008-06-02 08:07:52 UTC
Created attachment 155205 [details, diff]
fix to xmldocs.make to disambiguate docdir

I think this patch should fix the issue (requires an eautoreconf).

@team, if you think this is fine, I'll submit the patch upstream.
Comment 3 Chris Mayo 2008-06-02 17:23:43 UTC
Created attachment 155257 [details, diff]
patch help/manual/C/Makefile.in

Here's another thought:
   docdir = @docdir@
comes after:
   @ENABLE_SCROLLKEEPER_TRUE@docdir = $(datadir)/gnome/help/$(docname)/$(lang)

resetting it. Just reversing the order of these two seems to work:
/usr/share/gnome/help/gtk-doc-manual/C/fdl-appendix.xml
/usr/share/gnome/help/gtk-doc-manual/C/gtk-doc-manual.xml

Although even with a gnome2_scrollkeeper_update added it doesn't show up in yelp?
Comment 4 Rémi Cardona (RETIRED) gentoo-dev 2008-06-06 15:00:28 UTC
I just went for the simple way out : gtk-doc-1.10-r2 no longer installs the gtk-doc-manual that could have been viewed with yelp.

1) the current build uses the very *very* old scrollkeeper makefiles and I don't want to touch them with a 10-foot pole. I don't think it's ever worked properly as far as gtk-doc is concerned.

2) upstream actually fixed the manual by using gnome-doc-utils which is a bit cleaner (and it handles a lot of the scrollkeeper details on its own) but the patch is just too big.

3) the missing manual is available here : http://library.gnome.org/devel/gtk-doc-manual/stable/

Of course, we'll add those files back when gtk-doc 1.11+ is released. I just don't want any of us to waste a lot of time on this.

Thanks