--- plugins-scripts/subst.in.orig	Wed Aug 31 07:41:42 2005
+++ plugins-scripts/subst.in	Sun Sep 30 18:16:42 2007
@@ -1,7 +1,7 @@
 #!/usr/bin/awk
 
 function which(c,path) {
-	cmd = "test -x " c;
+	cmd = "[ " c " = @libexecdir@ ] || test -x " c;
 
 	if (system(cmd)==0) {
 		return c;