From 428c5f73d1a0235a14f7a70c5a99f749a3084dae Mon Sep 17 00:00:00 2001 From: Benjamin Schieder Date: Tue, 26 Sep 2006 07:47:42 +0000 Subject: [PATCH] Benjamin Schieder: fix the /usr/share/doc/HTML thing once and for all [2006092110512831054] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@7922 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/kde/kdelibs/kdelibs.conf | 5 +++++ package/kde/kdelibs/parse-config | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/package/kde/kdelibs/kdelibs.conf b/package/kde/kdelibs/kdelibs.conf index b14aa69a5..d58b5c7f2 100644 --- a/package/kde/kdelibs/kdelibs.conf +++ b/package/kde/kdelibs/kdelibs.conf @@ -39,6 +39,11 @@ 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 # 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 a5861b097..874a5c658 100644 --- a/package/kde/kdelibs/parse-config +++ b/package/kde/kdelibs/parse-config @@ -1 +1,5 @@ -[[ "`which kde-config`" != */ROCK/* ]] && export kde_htmldir="`${KDECONFIG:-kde-config} --install html --expandvars`" +# 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