building against uninstalled Glib

["Baker, Steve" <SBaker CHELLO com>]

When I attempted to build an app against an uninstalled CVS version of Glib,
I couldn't get the app to compile without making the below changes to the
*uninstalled.pc.in files (basically removing ${pc_top_builddir}/ from each
of them).

Is this change valid? Should it be committed?

Are there people out there successfully building against an uninstalled Glib
without this change?

cheers

Index: glib-2.0-uninstalled.pc.in
===================================================================
RCS file: /cvs/gnome/glib/glib-2.0-uninstalled.pc.in,v
retrieving revision 1.1
diff -u -r1.1 glib-2.0-uninstalled.pc.in
--- glib-2.0-uninstalled.pc.in	2001/06/07 16:39:53	1.1
+++ glib-2.0-uninstalled.pc.in	2001/08/11 17:44:50
@@ -5,5 +5,5 @@
 Name: GLib Uninstalled
 Description: C Utility Library, Not Installed
 Version: @VERSION@
-Libs: ${pc_top_builddir}/${pcfiledir}/libglib-1.3.la @ICONV_LIBS@
@INTLLIBS@
-Cflags: -I${pc_top_builddir}/${pcfiledir}
-I${pc_top_builddir}/${pcfiledir}/@srcdir@
+Libs: ${pcfiledir}/glib/libglib-1.3.la @ICONV_LIBS@ @INTLLIBS@
+Cflags: -I${pcfiledir} -I${pcfiledir}/glib
Index: gmodule-2.0.pc.in
===================================================================
RCS file: /cvs/gnome/glib/gmodule-2.0.pc.in,v
retrieving revision 1.6
diff -u -r1.6 gmodule-2.0.pc.in
--- gmodule-2.0.pc.in	2001/06/07 16:39:53	1.6
+++ gmodule-2.0.pc.in	2001/08/11 17:44:50
@@ -10,4 +10,4 @@
 Requires: glib-2.0
 Version: @VERSION@
 Libs: -L${libdir} @G_MODULE_LDFLAGS@ -lgmodule-1.3 @G_MODULE_LIBS@
-Cflags:
+Cflags: -I${includedir}
Index: gmodule-2.0-uninstalled.pc.in
===================================================================
RCS file: /cvs/gnome/glib/gmodule-2.0-uninstalled.pc.in,v
retrieving revision 1.1
diff -u -r1.1 gmodule-2.0-uninstalled.pc.in
--- gmodule-2.0-uninstalled.pc.in	2001/06/07 16:39:53	1.1
+++ gmodule-2.0-uninstalled.pc.in	2001/08/11 17:44:50
@@ -4,5 +4,5 @@
 Description: Dynamic module loader for GLib, Not Installed
 Requires: glib-2.0-uninstalled
 Version: @VERSION@
-Libs: @G_MODULE_LDFLAGS@
${pc_top_builddir}/${pcfiledir}/gmodule/libgmodule-1.3.la @G_MODULE_LIBS@
-Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@/gmodule
+Libs: @G_MODULE_LDFLAGS@ ${pcfiledir}/gmodule/libgmodule-1.3.la
@G_MODULE_LIBS@
+Cflags: -I${pcfiledir}/gmodule
Index: gobject-2.0-uninstalled.pc.in
===================================================================
RCS file: /cvs/gnome/glib/gobject-2.0-uninstalled.pc.in,v
retrieving revision 1.1
diff -u -r1.1 gobject-2.0-uninstalled.pc.in
--- gobject-2.0-uninstalled.pc.in	2001/06/07 16:39:53	1.1
+++ gobject-2.0-uninstalled.pc.in	2001/08/11 17:44:50
@@ -2,6 +2,6 @@
 Description: Object/type system for GLib, Not Installed
 Requires: glib-2.0-uninstalled
 Version: @VERSION@
-Libs: ${pc_top_builddir}/${pcfiledir}/gobject/libgobject-1.3.la
+Libs: ${pcfiledir}/gobject/libgobject-1.3.la
 ## cflags contains builddir in addition to srcdir because of gmarshal.h
-Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@
-I${pc_top_builddir}/${pcfiledir}
+Cflags: -I${pcfiledir}/@srcdir@ -I${pc_top_builddir}/${pcfiledir}
Index: gthread-2.0-uninstalled.pc.in
===================================================================
RCS file: /cvs/gnome/glib/gthread-2.0-uninstalled.pc.in,v
retrieving revision 1.2
diff -u -r1.2 gthread-2.0-uninstalled.pc.in
--- gthread-2.0-uninstalled.pc.in	2001/06/08 11:53:48	1.2
+++ gthread-2.0-uninstalled.pc.in	2001/08/11 17:44:50
@@ -2,5 +2,5 @@
 Description: Thread support for GLib, Not Installed
 Requires: glib-2.0-uninstalled
 Version: @VERSION@
-Libs: ${pc_top_builddir}/${pcfiledir}/gthread/libgthread-1.3.la
@G_THREAD_LIBS@
-Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@ @G_THREAD_CFLAGS@
+Libs: ${pcfiledir}/gthread/libgthread-1.3.la @G_THREAD_LIBS@
+Cflags: -I${pcfiledir}/@srcdir@ @G_THREAD_CFLAGS@