From 60445142f8d6aa086abd6eafd9e9b5e43934a157 Mon Sep 17 00:00:00 2001
From: Benjamin Schieder <blindcoder@scavenger.homeip.net>
Date: Mon, 18 Sep 2006 12:33:35 +0000
Subject: [PATCH] Benjamin Schieder: 	KDE: install documentation into
 /usr/share/doc/$xpkg/HTML 	     instead of /usr/share/doc/HTML 
 Build-Tools: add $cmd_WRAPPER_OUTPUTFILTER, an optional environment 	
      variable for filtering the output of wrapped commands. 		    
 Necessary for above KDE fix

[2006091813230947680] (https://www.rocklinux.net/submaster)



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@7909 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/kde/kdelibs/parse-config | 1 +
 package/kde/kdelibs/wrappers.in  | 2 ++
 scripts/Build-Tools              | 5 ++++-
 3 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 package/kde/kdelibs/parse-config
 create mode 100644 package/kde/kdelibs/wrappers.in

diff --git a/package/kde/kdelibs/parse-config b/package/kde/kdelibs/parse-config
new file mode 100644
index 000000000..2ce93dbb9
--- /dev/null
+++ b/package/kde/kdelibs/parse-config
@@ -0,0 +1 @@
+export kde_htmldir="`${KDECONFIG:-kde-config} --install html --expandvars`"
diff --git a/package/kde/kdelibs/wrappers.in b/package/kde/kdelibs/wrappers.in
new file mode 100644
index 000000000..68559a31f
--- /dev/null
+++ b/package/kde/kdelibs/wrappers.in
@@ -0,0 +1,2 @@
+KDECONFIG_WRAPPER_OUTPUTFILTER='sed "s,/doc/,/doc/$ROCK_XPKG/,"'
+build_wrapper KDECONFIG kde-config
diff --git a/scripts/Build-Tools b/scripts/Build-Tools
index 9b0c6bd9f..d1c7ea79c 100755
--- a/scripts/Build-Tools
+++ b/scripts/Build-Tools
@@ -178,7 +178,10 @@ if [ ! -f build/$ROCKCFG_ID/ROCK/$toolsdir/.lastupdate ] ; then
 				echo -n "${z}\$${y}_WRAPPER_FILTER"; z="|"
 			done ; echo '"'
 
-			echo 'exec cmd_wrapper $( basename $0 ) "$@"'
+			echo -n 'exec cmd_wrapper $( basename $0 ) "$@"'
+			eval "outputfilter=\"\$${y}_WRAPPER_OUTPUTFILTER\""
+			[ -n "${outputfilter}" ] && echo -n " | ${outputfilter}"
+			echo
 		} > $tmp
 		chmod +rx $tmp
 		mv $tmp "build/$ROCKCFG_ID/ROCK/$toolsdir/wrapper/$1"