Put the pkg-config scripts back to the correct pkg-config syntax

(the pkg-config that comes with the RedHat 7.0 glib-gtkbeta RPM and
 not the one from pkgconfig.sourceforge.net which is old).

diff --git a/ChangeLog b/ChangeLog
index 00b2e03..1677615 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,13 +11,6 @@
 
 2000-09-29  Martin Baulig  <baulig@suse.de>
 
-       * Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig';
-       this is the directory where pkg-config actually looks.
-
-       * *.pc.in: Made the pkg-config scripts actually work.
-
-2000-09-29  Martin Baulig  <baulig@suse.de>
-
        Several minor ANSI C fixes.
 
        Added missing casts:

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 00b2e03..1677615 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -11,13 +11,6 @@
 
 2000-09-29  Martin Baulig  <baulig@suse.de>
 
-       * Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig';
-       this is the directory where pkg-config actually looks.
-
-       * *.pc.in: Made the pkg-config scripts actually work.
-
-2000-09-29  Martin Baulig  <baulig@suse.de>
-
        Several minor ANSI C fixes.
 
        Added missing casts:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 00b2e03..1677615 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -11,13 +11,6 @@
 
 2000-09-29  Martin Baulig  <baulig@suse.de>
 
-       * Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig';
-       this is the directory where pkg-config actually looks.
-
-       * *.pc.in: Made the pkg-config scripts actually work.
-
-2000-09-29  Martin Baulig  <baulig@suse.de>
-
        Several minor ANSI C fixes.
 
        Added missing casts:

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 00b2e03..1677615 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -11,13 +11,6 @@
 
 2000-09-29  Martin Baulig  <baulig@suse.de>
 
-       * Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig';
-       this is the directory where pkg-config actually looks.
-
-       * *.pc.in: Made the pkg-config scripts actually work.
-
-2000-09-29  Martin Baulig  <baulig@suse.de>
-
        Several minor ANSI C fixes.
 
        Added missing casts:

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 00b2e03..1677615 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -11,13 +11,6 @@
 
 2000-09-29  Martin Baulig  <baulig@suse.de>
 
-       * Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig';
-       this is the directory where pkg-config actually looks.
-
-       * *.pc.in: Made the pkg-config scripts actually work.
-
-2000-09-29  Martin Baulig  <baulig@suse.de>
-
        Several minor ANSI C fixes.
 
        Added missing casts:

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 00b2e03..1677615 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -11,13 +11,6 @@
 
 2000-09-29  Martin Baulig  <baulig@suse.de>
 
-       * Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig';
-       this is the directory where pkg-config actually looks.
-
-       * *.pc.in: Made the pkg-config scripts actually work.
-
-2000-09-29  Martin Baulig  <baulig@suse.de>
-
        Several minor ANSI C fixes.
 
        Added missing casts:

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 00b2e03..1677615 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -11,13 +11,6 @@
 
 2000-09-29  Martin Baulig  <baulig@suse.de>
 
-       * Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig';
-       this is the directory where pkg-config actually looks.
-
-       * *.pc.in: Made the pkg-config scripts actually work.
-
-2000-09-29  Martin Baulig  <baulig@suse.de>
-
        Several minor ANSI C fixes.
 
        Added missing casts:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 00b2e03..1677615 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -11,13 +11,6 @@
 
 2000-09-29  Martin Baulig  <baulig@suse.de>
 
-       * Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig';
-       this is the directory where pkg-config actually looks.
-
-       * *.pc.in: Made the pkg-config scripts actually work.
-
-2000-09-29  Martin Baulig  <baulig@suse.de>
-
        Several minor ANSI C fixes.
 
        Added missing casts:

diff --git a/Makefile.am b/Makefile.am
index ecff8b1..d6993ba 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -122,7 +122,7 @@ testgdateparser_LDADD = libglib-1.3.la
 m4datadir = $(datadir)/aclocal
 m4data_DATA = glib-2.0.m4
 
-pkgconfigdir = $(libexecdir)/pkgconfig
+pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = glib-2.0.pc gobject-2.0.pc gmodule-2.0.pc gthread-2.0.pc
 
 glibconfig.h.win32: $(top_builddir)/config.status $(top_srcdir)/glibconfig.h.win32.in

diff --git a/glib-2.0.pc.in b/glib-2.0.pc.in
index 3d6c84c..a77335b 100644 (file)
--- a/glib-2.0.pc.in
+++ b/glib-2.0.pc.in
@@ -3,12 +3,8 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-VERSION="@VERSION@"
-REQUIRES=""
-CFLAGS="-I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include $CFLAGS"
-LIBS_PATH="-L${libdir} $LIBS_PATH"
-LIBS_LINK_SELF="-lglib-1.3 $LIBS_LINK_SELF"
-LIBS_LINK_SYSTEM="$LIBS_LINK_SYSTEM"
-
-#Name: GLib
-#Description: C Utility Library
+Name: GLib
+Description: C Utility Library
+Version: @VERSION@
+Libs: -L${libdir} -lglib-1.3
+Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include 

diff --git a/glib/Makefile.am b/glib/Makefile.am
index ecff8b1..d6993ba 100644 (file)
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -122,7 +122,7 @@ testgdateparser_LDADD = libglib-1.3.la
 m4datadir = $(datadir)/aclocal
 m4data_DATA = glib-2.0.m4
 
-pkgconfigdir = $(libexecdir)/pkgconfig
+pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = glib-2.0.pc gobject-2.0.pc gmodule-2.0.pc gthread-2.0.pc
 
 glibconfig.h.win32: $(top_builddir)/config.status $(top_srcdir)/glibconfig.h.win32.in

diff --git a/gmodule-2.0.pc.in b/gmodule-2.0.pc.in
index 4c7af30..bca8fde 100644 (file)
--- a/gmodule-2.0.pc.in
+++ b/gmodule-2.0.pc.in
@@ -3,12 +3,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-REQUIRES="glib-2.0"
-VERSION="@VERSION@"
-CFLAGS="$CFLAGS"
-LIBS_PATH="-L${libdir} @G_MODULE_LDFLAGS@ $LIBS_PATH"
-LIBS_LINK_SELF="-lgmodule-1.3 $LIBS_LINK_SELF"
-LIBS_LINK_SYSTEM="@G_MODULE_LIBS@ $LIBS_LINK_SYSTEM"
-
-#Name: GModule
-#Description: Dynamic module loader for GLib
+Name: GModule
+Description: Dynamic module loader for GLib
+Requires: glib-2.0
+Version: @VERSION@
+Libs: -L${libdir} @G_MODULE_LDFLAGS@ -lgmodule-1.3 @G_MODULE_LIBS@
+Cflags:

diff --git a/gobject-2.0.pc.in b/gobject-2.0.pc.in
index b5e3284..54929f7 100644 (file)
--- a/gobject-2.0.pc.in
+++ b/gobject-2.0.pc.in
@@ -3,12 +3,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-REQUIRES="glib-2.0"
-VERSION="@VERSION@"
-CFLAGS="$CFLAGS"
-LIBS_PATH="-L${libdir} $LIBS_PATH"
-LIBS_LINK_SELF="-lobject-1.3 $LIBS_LINK_SELF"
-LIBS_LINK_SYSTEM="$LIBS_LINK_SYSTEM"
-
-#Name: GObject
-#Description: Object/type system for GLib
+Name: GObject
+Description: Object/type system for GLib
+Requires: glib-2.0
+Version: @VERSION@
+Libs: -L${libdir} -lgobject-1.3
+Cflags:

diff --git a/gthread-2.0.pc.in b/gthread-2.0.pc.in
index eea6f5a..cbe7f4e 100644 (file)
--- a/gthread-2.0.pc.in
+++ b/gthread-2.0.pc.in
@@ -3,12 +3,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-REQUIRES="glib-2.0"
-VERSION="@VERSION@"
-CFLAGS="$CFLAGS"
-LIBS_PATH="-L${libdir} $LIBS_PATH"
-LIBS_LINK_SELF="-lgthread-1.3 $LIBS_LINK_SELF"
-LIBS_LINK_SYSTEM="@G_THREAD_LIBS@ $LIBS_LINK_SYSTEM"
-
-#Name: GThread
-#Description: Thread support for GLib
+Name: GThread
+Description: Thread support for GLib
+Requires: glib-2.0
+Version: @VERSION@
+Libs: -L${libdir} -lgthread-1.3 @G_THREAD_LIBS@
+Cflags: