Re: [trinity-devel] WHOA - 3513-sru 'Most' KHelpCenter App Manuals - MISSING (Bug 1178)

On 08/19/2012 11:31 AM, Francois Andriot wrote: Thank Francios, That works for cmake apps, but for autotools apps, I am having to fix the ones that don't go in the correct spot at build time with sed like: ## fix doc install location msg "Patching datadir location share/doc/kde/HTML ..." sed -i 's|doc/HTML|doc/kde/HTML|' ${pkgname#*-}/admin/acinclude.m4.in That will set kde_htmldir to: kde_htmldir='\${datadir}/doc/kde/HTML' That works with the current tdelibs setting. Once we get a decision on whether to move 3.5.13-sru to ${datadir}/doc/HTML or leaving it as it is ${datadir}/doc/kde/HTML we can make it consistent in the GIT tree for both cmake and autotools applications. As Darrell pointed out, the hardcoding occurs in tdelibs/kdecore/kstandarddirs.cpp on line 1042: TQString KStandardDirs::kde_default(const char *type) { if (!strcmp(type, "data")) return "share/apps/"; if (!strcmp(type, "html-bundle")) return "share/doc-bundle/HTML/"; if (!strcmp(type, "html")) 1042 return "share/doc/kde/HTML/"; Unless we are going to patch/change the location in kstandarddirs.cpp, then I think we make that the default or all packages. The location just has to be consistent. From what I can tell, all of the cmake packages are putting the docs there. That means we will have to either patch, or handle build-time fixing for all autotools packages admin/acinclude.m4.in files. (that seems stupid, but unless we do that, we won't have help files in khelpcenter) Since I looks like most all autotools files already put doc files in share/doc/HTML/<lang>, it seems to make much more sense just to fix tdelibs to install in the same place. If I understand correctly, the single change in tdelibs from: return "share/doc/kde/HTML/"; to return "share/doc/HTML/"; would fix the majority of the problem and be consistent for both R14 and 3513 eliminating the need for any 't'de or 'k'de between /doc/../HTML. Here are the current autotools docs installed in doc/HTML: 18:04 tdesru:/opt/trinity/share/doc/HTML/en> l1 amor ark atlantik basket blinken bookreader cervisia chalk doc filelight gwenview irkick k3b k9copy kaffeine kalzium kanagram karbon kasteroids katapult kate-plugins katomic kbabel kbackgammon kbattleship kblackbox kbounce kbruch kbugbuster kcachegrind kcalc kcharselect kchart kcmlirc kcontrol kcron kdat kdesvn kdesvn-build kdf kdiff3 kdirstat kdmtheme kedit keduca kenolaba kexi kfloppy kformula kfouleggs kgeography kgoldrunner kgpg khangman khexedit kicker-applets kig kima kinfocenter kipi-plugins kiten kivio kjots kjumpingcube klatin klettres klickety klines kmag kmahjongg kmines kmoon kmousetool kmouth kmplayer kmplot knetstats knetworkconf knutclient kodo koffice kolf kompare konq-plugins konquest konversation koshell kpackage kpat kpercentage kplato kpoker kpresenter KRegExpEditor kreversi krusader ksame kshisen ksig ksim ksirtet ksmiletris ksnake ksokoban kspaceduel kspread kstars ksysv kteatime ktimer ktouch ktron kttsd ktuberling kturtle kugar kuser kverbos kvoctrain kwallet kweather kwin4 kword kwordquiz kworldclock lilo-config lskat superkaramba thesaurus umbrello I don't know why R14 continues to use 'return "share/doc/tde/HTML/";'? Darrell, would dropping the tde/kde from tdelibs/tdecore/kstandarddirs.cpp work for R14?? -- David C. Rankin, J.D.,P.E.