diff --git a/package/kde/kdelibs/kdelibs.conf b/package/kde/kdelibs/kdelibs.conf index d58b5c7f2..e3fe0c4a1 100644 --- a/package/kde/kdelibs/kdelibs.conf +++ b/package/kde/kdelibs/kdelibs.conf @@ -42,8 +42,8 @@ EOP # yes this is unwieldy. We need te wrapper, too, for broken configure scripts # hape says this'll work again in the next version versionhotfix 3.5.4 -export kde_htmldir=${ROCKCFG_PKG_KDE3_CORE_PREFIX}/share/kdelibs/HTML -export kde_libs_htmldir=${ROCKCFG_PKG_KDE3_CORE_PREFIX}/share/kdelibs/HTML +export kde_htmldir=${ROCKCFG_PKG_KDE3_CORE_PREFIX}/share/doc/KDE/HTML +export kde_libs_htmldir="${kde_htmldir}" # 2.4 kernels only support dnotify, 2.6 supports both dnotify and inotify var_append confopt " " "--enable-dnotify --enable-inotify" diff --git a/package/kde/kdelibs/parse-config b/package/kde/kdelibs/parse-config index 874a5c658..c92086d13 100644 --- a/package/kde/kdelibs/parse-config +++ b/package/kde/kdelibs/parse-config @@ -1,5 +1,2 @@ -# if /usr/bin/kde-config exists, the wrapper exists, too. -if [ -x $root/$ROCKCFG_PKG_KDE3_CORE_PREFIX/bin/kde-config ] ; then - export kde_htmldir="`kde-config --install html --expandvars`" - export KDECONFIG="`which kde-config`" -fi +export kde_htmldir=${ROCKCFG_PKG_KDE3_CORE_PREFIX}/share/doc/KDE/HTML +export kde_libs_htmldir="${kde_htmldir}" diff --git a/package/kde/kdelibs/wrappers.in b/package/kde/kdelibs/wrappers.in index 68559a31f..0d7ba0048 100644 --- a/package/kde/kdelibs/wrappers.in +++ b/package/kde/kdelibs/wrappers.in @@ -1,2 +1,2 @@ -KDECONFIG_WRAPPER_OUTPUTFILTER='sed "s,/doc/,/doc/$ROCK_XPKG/,"' +KDECONFIG_WRAPPER_OUTPUTFILTER='sed "s,/doc/,/doc/KDE/,"' build_wrapper KDECONFIG kde-config