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 3553bf637fc7c83e9740970e72e0d94609832670..0b50514e953f250882da3fe4c4c2ee77e87b91a6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,14 +23,9 @@
 
 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.
-
        * gdk-pixbuf.pc.in: Renamed to gdb-pixbuf-2.0.pc.in to avoid
        confusion with the GdkPixbuf of the GNOME 1.x platform.
 
-       * *.pc.in: Made the pkg-config scripts actually work.
-
 2000-09-29  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtktextview.c: Implement the side windows.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 3553bf637fc7c83e9740970e72e0d94609832670..0b50514e953f250882da3fe4c4c2ee77e87b91a6 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -23,14 +23,9 @@
 
 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.
-
        * gdk-pixbuf.pc.in: Renamed to gdb-pixbuf-2.0.pc.in to avoid
        confusion with the GdkPixbuf of the GNOME 1.x platform.
 
-       * *.pc.in: Made the pkg-config scripts actually work.
-
 2000-09-29  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtktextview.c: Implement the side windows.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3553bf637fc7c83e9740970e72e0d94609832670..0b50514e953f250882da3fe4c4c2ee77e87b91a6 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -23,14 +23,9 @@
 
 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.
-
        * gdk-pixbuf.pc.in: Renamed to gdb-pixbuf-2.0.pc.in to avoid
        confusion with the GdkPixbuf of the GNOME 1.x platform.
 
-       * *.pc.in: Made the pkg-config scripts actually work.
-
 2000-09-29  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtktextview.c: Implement the side windows.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 3553bf637fc7c83e9740970e72e0d94609832670..0b50514e953f250882da3fe4c4c2ee77e87b91a6 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -23,14 +23,9 @@
 
 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.
-
        * gdk-pixbuf.pc.in: Renamed to gdb-pixbuf-2.0.pc.in to avoid
        confusion with the GdkPixbuf of the GNOME 1.x platform.
 
-       * *.pc.in: Made the pkg-config scripts actually work.
-
 2000-09-29  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtktextview.c: Implement the side windows.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 3553bf637fc7c83e9740970e72e0d94609832670..0b50514e953f250882da3fe4c4c2ee77e87b91a6 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -23,14 +23,9 @@
 
 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.
-
        * gdk-pixbuf.pc.in: Renamed to gdb-pixbuf-2.0.pc.in to avoid
        confusion with the GdkPixbuf of the GNOME 1.x platform.
 
-       * *.pc.in: Made the pkg-config scripts actually work.
-
 2000-09-29  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtktextview.c: Implement the side windows.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 3553bf637fc7c83e9740970e72e0d94609832670..0b50514e953f250882da3fe4c4c2ee77e87b91a6 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -23,14 +23,9 @@
 
 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.
-
        * gdk-pixbuf.pc.in: Renamed to gdb-pixbuf-2.0.pc.in to avoid
        confusion with the GdkPixbuf of the GNOME 1.x platform.
 
-       * *.pc.in: Made the pkg-config scripts actually work.
-
 2000-09-29  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtktextview.c: Implement the side windows.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 3553bf637fc7c83e9740970e72e0d94609832670..0b50514e953f250882da3fe4c4c2ee77e87b91a6 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -23,14 +23,9 @@
 
 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.
-
        * gdk-pixbuf.pc.in: Renamed to gdb-pixbuf-2.0.pc.in to avoid
        confusion with the GdkPixbuf of the GNOME 1.x platform.
 
-       * *.pc.in: Made the pkg-config scripts actually work.
-
 2000-09-29  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtktextview.c: Implement the side windows.

diff --git a/Makefile.am b/Makefile.am
index fcc414fca1dc3554d138d3c581f485e17702212e..eb9a24f29757815dc0edcfd9b84b24123261a025 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -112,7 +112,7 @@ EXTRA_DIST =                        \
        examples/spinbutton/Makefile  \
        examples/find-examples.sh
 
-pkgconfigdir = $(libexecdir)/pkgconfig
+pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA= gdk-pixbuf-2.0.pc gdk-2.0.pc gtk+-2.0.pc
 
 dist-hook: gtk+.spec

diff --git a/gdk-2.0.pc.in b/gdk-2.0.pc.in
index 81e319278c049a502115ef8e8ce57a13de911804..0dc03329c934ee1ab8115a926414b118685d28ac 100644 (file)
--- a/gdk-2.0.pc.in
+++ b/gdk-2.0.pc.in
@@ -4,12 +4,9 @@ libdir=@libdir@
 includedir=@includedir@
 target=@gdktarget@
 
-VERSION="@VERSION@"
-REQUIRES="gdk-pixbuf pangox"
-CFLAGS="-I${includedir}/gtk-2.0 -I${libdir}/gtk-2.0/include @more_cflags@ $CFLAGS"
-LIBS_PATH="-L${libdir} $LIBS_PATH"
-LIBS_LINK_SELF="-lgdk-${target}-1.3 @GDK_WLIBS@ $LIBS_LINK_SELF"
-LIBS_LINK_SYSTEM="@more_ldflags@ @more_libs@ $LIBS_LINK_SYSTEM"
-
-#Name: GDK
-#Description: GIMP Drawing Kit
+Name: GDK
+Description: GIMP Drawing Kit
+Version: @VERSION@
+Requires: gdk-pixbuf,pangox
+Libs: -L${libdir} @more_ldflags@ -lgdk-${target}-1.3 @more_libs@ @GDK_WLIBS@
+Cflags: -I${includedir}/gtk-2.0 -I${libdir}/gtk-2.0/include @more_cflags@

diff --git a/gdk-pixbuf-2.0.pc.in b/gdk-pixbuf-2.0.pc.in
index af33e03ad3bc4d4140e0aa2a849052ba669a3bed..96afc3d31b71a7a32cb6c4acb229afed986e7baf 100644 (file)
--- a/gdk-pixbuf-2.0.pc.in
+++ b/gdk-pixbuf-2.0.pc.in
@@ -3,12 +3,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-VERSION="@VERSION@"
-REQUIRES="gobject-2.0 gmodule-2.0"
-CFLAGS="-I${includedir} $CFLAGS"
-LIBS_PATH="-L${libdir} $LIBS_PATH"
-LIBS_LINK_SELF="-lgdk_pixbuf-1.3 $LIBS_LINK_SELF"
-LIBS_LINK_SYSTEM="@INTLLIBS@ @MATH_LIB@"
-
-#Name: GdkPixbuf
-#Description: Image loading and scaling
+Name: GdkPixbuf
+Description: Image loading and scaling
+Version: @VERSION@
+Requires: gobject-2.0,gmodule-2.0
+Libs: -L${libdir} -lgdk_pixbuf-1.3 @INTLLIBS@ @MATH_LIB@
+Cflags: -I${includedir}

diff --git a/gtk+-2.0.pc.in b/gtk+-2.0.pc.in
index ee2d8ed8b5fa590be21de585c10ab0e3c657f86a..ddf6c4b62d60fec3d8725d7733305cf2d32d97e4 100644 (file)
--- a/gtk+-2.0.pc.in
+++ b/gtk+-2.0.pc.in
@@ -4,12 +4,9 @@ libdir=@libdir@
 includedir=@includedir@
 target=@gdktarget@
 
-VERSION="@VERSION@"
-REQUIRES="gdk-2.0"
-CFLAGS="-I${includedir} $CFLAGS"
-LIBS_PATH="-L${libdir} $LIBS_PATH"
-LIBS_LINK_SELF="-lgtk-${target}-1.3 $LIBS_LINK_SELF"
-LIBS_LINK_SYSTEM="$LIBS_LINK_SYSTEM"
-
-#Name: GTK+
-#Description: GIMP Tool Kit
+Name: GTK+
+Description: GIMP Tool Kit
+Version: @VERSION@
+Requires: gdk-2.0
+Libs: -L${libdir} -lgtk-${target}-1.3
+Cflags: -I${includedir}