--- configure.orig	Tue Dec  5 16:15:01 2006
+++ configure	Sat Dec  9 19:38:53 2006
@@ -31793,8 +31793,8 @@
 	   openldap_LDFLAGS="-lldap -llber"
 	   LDFLAGS="$LDFLAGS $openldap_LDFLAGS" ;;
 	*)
-	   openssl_CFLAGS="-I$with_ldap/include"
-	   openssl_LDFLAGS="-L$with_ldap/lib -lldap -llber"
+	   openldap_CFLAGS="-I$with_ldap/include"
+	   openldap_LDFLAGS="-L$with_ldap/lib -lldap -llber"
 	   CPPFLAGS="$CPPFLAGS $openldap_CFLAGS"
 	   LDFLAGS="$LDFLAGS $openldap_LDFLAGS"
 	   LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$with_ldap/lib" ;;
@@ -35834,13 +35834,13 @@
 ##  various destination dirs                      			##
 ##									##
 ##########################################################################
-virtdatadir=$datadir/virtuoso
+virtdatadir=$prefix/virtuoso
 vaddir=$virtdatadir/vad
 docdir=$virtdatadir/doc
 htmldocdir=$docdir/html
 pdfdocdir=$docdir/pdf
 
-virtstatedir=$localstatedir/lib/virtuoso
+virtstatedir=$prefix/virtuoso
 demodir=$virtstatedir/demo
 dbdir=$virtstatedir/db
 httprootdir=$virtstatedir/vsp