--- configure.orig	Fri Sep 30 01:52:47 2005
+++ configure	Fri Oct 21 11:14:15 2005
@@ -21513,13 +21513,13 @@
 
 
 
-LIBOIL_CFLAGS="$LIBOIL_CFLAGS -D_BSD_SOURCE -D_GNU_SOURCE -I\$(top_srcdir) -O2"
+LIBOIL_CFLAGS="$LIBOIL_CFLAGS -D_BSD_SOURCE -D_GNU_SOURCE -I\$(top_srcdir) $(CFLAGS)"
 
 
 LIBOIL_LIBS="\$(top_builddir)/liboil/liboil-$LIBOIL_MAJORMINOR.la"
 
 
-pkgconfigdir="\$(libdir)/pkgconfig"
+pkgconfigdir="\$(prefix)/libdata/pkgconfig"
 
 
 #CFLAGS=`echo "$CFLAGS" | sed -e 's/-O[0-9*]//g'`