--- webapp-config	2004-08-28 15:20:31.884609472 +0200
+++ /usr/sbin/webapp-config	2004-08-28 15:25:18.126094152 +0200
@@ -15,13 +15,18 @@
 
 umask 0
 
+get_libdir() {
+	CONF_LIBDIR=$(`which portageq` envvar CONF_LIBDIR)
+	echo ${CONF_LIBDIR:=lib}
+}
+
 # ========================================================================
 # Some configuration variables
 # ------------------------------------------------------------------------
 
 MY_DOTCONFIG=".webapp"
 MY_ETCCONFIG="/etc/vhosts/webapp-config"
-MY_LIBROOT="/usr/lib/webapp-config"
+MY_LIBROOT="/usr/$(get_libdir)/webapp-config"
 MY_SERVERSDIR="${MY_LIBROOT}/servers"
 MY_VERSION="1.10-r10"
 MY_CONF_VERSION="5"
@@ -1088,7 +1093,7 @@
 
 fn_dirisconfigprotected ()
 {
-	local my_master="`/usr/lib/portage/bin/portageq config_protect`"
+	local my_master="$(`which portageq` config_protect)"
 
 	# is the directory relative, or absolute?