Set this to `$(libexecdir)/pkgconfig'; this is the directory where

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.

diff --git a/ChangeLog b/ChangeLog
index 2b0c0608633e21524454b6c426da19bbc8a91961..38da20a91c072e1104f55a9d3ed91926bc4c4bc9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 2b0c0608633e21524454b6c426da19bbc8a91961..38da20a91c072e1104f55a9d3ed91926bc4c4bc9 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+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.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2b0c0608633e21524454b6c426da19bbc8a91961..38da20a91c072e1104f55a9d3ed91926bc4c4bc9 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+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.

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 2b0c0608633e21524454b6c426da19bbc8a91961..38da20a91c072e1104f55a9d3ed91926bc4c4bc9 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,10 @@
+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.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 2b0c0608633e21524454b6c426da19bbc8a91961..38da20a91c072e1104f55a9d3ed91926bc4c4bc9 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+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.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 2b0c0608633e21524454b6c426da19bbc8a91961..38da20a91c072e1104f55a9d3ed91926bc4c4bc9 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+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.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 2b0c0608633e21524454b6c426da19bbc8a91961..38da20a91c072e1104f55a9d3ed91926bc4c4bc9 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+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.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 2b0c0608633e21524454b6c426da19bbc8a91961..38da20a91c072e1104f55a9d3ed91926bc4c4bc9 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+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.

diff --git a/Makefile.am b/Makefile.am
index 104d783b1b6722768e811190b8a47423370f333b..f0e75e5df6553972f5e71393c17cf5a1aa20273b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -116,7 +116,7 @@ testgdateparser_LDADD = libglib-1.3.la
 m4datadir = $(datadir)/aclocal
 m4data_DATA = glib-2.0.m4
 
-pkgconfigdir = $(libdir)/pkgconfig
+pkgconfigdir = $(libexecdir)/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 a77335beca16671189b33e544523ce94c0d81b18..3d6c84c32574de3dca89ec26397328f7025b2758 100644 (file)
--- a/glib-2.0.pc.in
+++ b/glib-2.0.pc.in
@@ -3,8 +3,12 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-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 
+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

diff --git a/glib/Makefile.am b/glib/Makefile.am
index 104d783b1b6722768e811190b8a47423370f333b..f0e75e5df6553972f5e71393c17cf5a1aa20273b 100644 (file)
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -116,7 +116,7 @@ testgdateparser_LDADD = libglib-1.3.la
 m4datadir = $(datadir)/aclocal
 m4data_DATA = glib-2.0.m4
 
-pkgconfigdir = $(libdir)/pkgconfig
+pkgconfigdir = $(libexecdir)/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 bca8fdea5e3aed3d748ba458e66a633870323a05..8526582167e47d04978e99aa0a1aa353c24177de 100644 (file)
--- a/gmodule-2.0.pc.in
+++ b/gmodule-2.0.pc.in
@@ -3,9 +3,12 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-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:
+REQUIRES="glib-2.0"
+VERSION="@VERSION@"
+CFLAGS="$CFLAGS"
+LIBS_PATH="-L${libdir} $LIBS_PATH"
+LIBS_LINK_SELF="@G_MODULE_LDFLAGS@ -lgmodule-1.3 @G_MODULE_LIBS@ $LIBS_LINK_SELF"
+LIBS_LINK_SYSTEM="$LIBS_LINK_SYSTEM"
+
+#Name: GModule
+#Description: Dynamic module loader for GLib

diff --git a/gobject-2.0.pc.in b/gobject-2.0.pc.in
index 54929f7f7503a6a1be3ca6b4952963276ec3e2ca..b5e32842961c99f7b029f7507622c3e6c8869a80 100644 (file)
--- a/gobject-2.0.pc.in
+++ b/gobject-2.0.pc.in
@@ -3,9 +3,12 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: GObject
-Description: Object/type system for GLib
-Requires: glib-2.0
-Version: @VERSION@
-Libs: -L${libdir} -lgobject-1.3
-Cflags:
+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

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