--- flac-1.1.0/configure.foo	2003-12-12 01:55:33.000000000 -0500
+++ flac-1.1.0/configure	2003-12-12 01:56:11.000000000 -0500
@@ -8161,7 +8161,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"
@@ -8171,7 +8171,7 @@
   elif test "x$ogg_prefix" != "x" ; then
     OGG_CFLAGS="-I$ogg_prefix/include"
   elif test "$prefix" != "xNONE"; then
-    OGG_CFLAGS="-I$prefix/include"
+    OGG_CFLAGS=""
   fi
 
   echo "$as_me:$LINENO: checking for Ogg" >&5
--- flac-1.1.0/src/libFLAC/libFLAC.m4.cow	2002-07-01 16:37:39.000000000 -0400
+++ flac-1.1.0/src/libFLAC/libFLAC.m4	2003-12-12 01:56:51.000000000 -0500
@@ -18,7 +18,7 @@
   elif test "x$libFLAC_prefix" != "x" ; then
     LIBFLAC_LIBS="-L$libFLAC_prefix/lib"
   elif test "x$prefix" != "xNONE" ; then
-    LIBFLAC_LIBS="-L$prefix/lib"
+    LIBFLAC_LIBS="-L$libdir"
   fi
 
   LIBFLAC_LIBS="$LIBFLAC_LIBS -lFLAC -lm"
--- flac-1.1.0/src/libFLAC++/libFLAC++.m4.cow	2002-07-01 16:37:39.000000000 -0400
+++ flac-1.1.0/src/libFLAC++/libFLAC++.m4	2003-12-12 01:56:51.000000000 -0500
@@ -19,7 +19,7 @@
   elif test "x$libFLACPP_prefix" != "x" ; then
     LIBFLACPP_LIBS="-L$libFLACPP_prefix/lib"
   elif test "x$prefix" != "xNONE" ; then
-    LIBFLACPP_LIBS="-L$prefix/lib"
+    LIBFLACPP_LIBS="-L$libdir"
   fi
 
   LIBFLACPP_LIBS="$LIBFLACPP_LIBS -lFLAC++ $LIBFLAC_LIBS"
--- flac-1.1.0/src/libOggFLAC/libOggFLAC.m4.cow	2002-08-06 01:31:17.000000000 -0400
+++ flac-1.1.0/src/libOggFLAC/libOggFLAC.m4	2003-12-12 01:56:51.000000000 -0500
@@ -18,7 +18,7 @@
   elif test "x$libOggFLAC_prefix" != "x" ; then
     LIBOGGFLAC_LIBS="-L$libOggFLAC_prefix/lib"
   elif test "x$prefix" != "xNONE" ; then
-    LIBOGGFLAC_LIBS="-L$prefix/lib"
+    LIBOGGFLAC_LIBS="-L$libdir"
   fi
 
   LIBOGGFLAC_LIBS="$LIBOGGFLAC_LIBS -lOggFLAC -lFLAC -lm"
--- flac-1.1.0/src/libOggFLAC++/libOggFLAC++.m4.cow	2002-08-07 13:05:16.000000000 -0400
+++ flac-1.1.0/src/libOggFLAC++/libOggFLAC++.m4	2003-12-12 01:56:51.000000000 -0500
@@ -19,7 +19,7 @@
   elif test "x$libOggFLACPP_prefix" != "x" ; then
     LIBOGGFLACPP_LIBS="-L$libOggFLACPP_prefix/lib"
   elif test "x$prefix" != "xNONE" ; then
-    LIBOGGFLACPP_LIBS="-L$prefix/lib"
+    LIBOGGFLACPP_LIBS="-L$libdir"
   fi
 
   LIBOGGFLACPP_LIBS="$LIBOGGFLACPP_LIBS -lOggFLAC++ $LIBOGGFLAC_LIBS"