--- libvorbis-1.0/vorbis.m4.m4-patch	2002-07-09 09:08:57.000000000 -0400
+++ libvorbis-1.0/vorbis.m4	2003-02-21 09:46:34.000000000 -0500
@@ -20,7 +20,7 @@
   elif test "x$vorbis_prefix" != "x" ; then
     VORBIS_LIBS="-L$vorbis_prefix/lib"
   elif test "x$prefix" != "xNONE"; then
-    VORBIS_LIBS="-L$prefix/lib"
+    VORBIS_LIBS="-L$libdir"
   fi
 
   VORBIS_LIBS="$VORBIS_LIBS -lvorbis -lm"
@@ -32,7 +32,7 @@
   elif test "x$vorbis_prefix" != "x" ; then
     VORBIS_CFLAGS="-I$vorbis_prefix/include"
   elif test "x$prefix" != "xNONE"; then
-    VORBIS_CFLAGS="-I$prefix/include"
+    VORBIS_CFLAGS=""
   fi
 
 
--- libvorbis-1.0/configure.m4-patch	2002-07-19 08:26:08.000000000 -0400
+++ libvorbis-1.0/configure	2003-02-21 09:46:22.000000000 -0500
@@ -5704,7 +5704,7 @@
   elif test "x$ogg_prefix" != "x" ; then
     OGG_LIBS="-L$ogg_prefix/lib"
   elif test "x$prefix" != "xNONE" ; then
-    OGG_LIBS="-L$prefix/lib"
+    OGG_LIBS="-L$libdir"
   fi
 
   OGG_LIBS="$OGG_LIBS -logg"
@@ -5714,7 +5714,7 @@
   elif test "x$ogg_prefix" != "x" ; then
     OGG_CFLAGS="-I$ogg_prefix/include"
   elif test "x$prefix" != "xNONE"; then
-    OGG_CFLAGS="-I$prefix/include"
+    OGG_CFLAGS=""
   fi
 
   echo $ac_n "checking for Ogg""... $ac_c" 1>&6