--- qvamps.orig	Sat Oct  8 06:04:37 2005
+++ qvamps	Wed Jan 11 10:05:26 2006
@@ -19,14 +19,14 @@
   {
     print STDERR "qVamps: loading modules from $qvamps_home/share/lib\n";
     unshift @INC, "$qvamps_home/share/lib";
-    unshift @INC, "$qvamps_home/lib/$archname";
+    unshift @INC, "$qvamps_home/lib";
   }
-  elsif ($load_prefix && -e "$load_prefix/share/qvamps")
+  elsif ($load_prefix && -e "%%DATADIR%%")
   {
     print STDERR "qVamps: loading modules from " .
-                 "$load_prefix/share/qvamps/lib\n";
-    unshift @INC, "$load_prefix/share/qvamps/lib";
-    unshift @INC, "$load_prefix/lib/qvamps/$archname";
+                 "%%DATADIR%%/lib\n";
+    unshift @INC, "%%DATADIR%%/lib";
+    unshift @INC, "$load_prefix/lib/qvamps";
   }
 }