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.

10 files changed, 68 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 184b8e7c..7e4577a4 100644
--- 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-28  Havoc Pennington  <hp@pobox.com>
 
 	* pango/pango-tabs.c (pango_tab_array_new_with_positions): was 
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 184b8e7c..7e4577a4 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-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-28  Havoc Pennington  <hp@pobox.com>
 
 	* pango/pango-tabs.c (pango_tab_array_new_with_positions): was 
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 184b8e7c..7e4577a4 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-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-28  Havoc Pennington  <hp@pobox.com>
 
 	* pango/pango-tabs.c (pango_tab_array_new_with_positions): was 
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 184b8e7c..7e4577a4 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-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-28  Havoc Pennington  <hp@pobox.com>
 
 	* pango/pango-tabs.c (pango_tab_array_new_with_positions): was 
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 184b8e7c..7e4577a4 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-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-28  Havoc Pennington  <hp@pobox.com>
 
 	* pango/pango-tabs.c (pango_tab_array_new_with_positions): was 
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 184b8e7c..7e4577a4 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-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-28  Havoc Pennington  <hp@pobox.com>
 
 	* pango/pango-tabs.c (pango_tab_array_new_with_positions): was 
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 184b8e7c..7e4577a4 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-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-28  Havoc Pennington  <hp@pobox.com>
 
 	* pango/pango-tabs.c (pango_tab_array_new_with_positions): was 
diff --git a/Makefile.am b/Makefile.am
index 84724247..c8677bba 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,7 +10,7 @@ EXTRA_DIST = 		\
 	pango.pc.in	\
 	pangox.pc.in
 
-pkgconfigdir = $(libdir)/pkgconfig
+pkgconfigdir = $(libexecdir)/pkgconfig
 pkgconfig_DATA = pango.pc pangox.pc
 
 dist-hook: pango.spec
diff --git a/pango.pc.in b/pango.pc.in
index a774a46e..fd601e5e 100644
--- a/pango.pc.in
+++ b/pango.pc.in
@@ -3,11 +3,14 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: Pango
-Description: Internationalized text handling
-Version: @VERSION@
-Requires: fribidi,gobject-2.0,gmodule-2.0
-Libs: -L${libdir} -lpango
-Cflags:
+VERSION="@VERSION@"
+REQUIRES="fribidi gobject-2.0 gmodule-2.0"
+CFLAGS=""
+LIBS_PATH="-L${libdir}"
+LIBS_SELF_LIBS="-lpango"
+LIBS_SYSTEM_LIBS=""
+
+#Name: Pango
+#Description: Internationalized text handling
 
 
diff --git a/pangox.pc.in b/pangox.pc.in
index 7ecf6b24..ae1a005c 100644
--- a/pangox.pc.in
+++ b/pangox.pc.in
@@ -3,10 +3,13 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: Pango X
-Description: X Window System font support for Pango
-Version: @VERSION@
-Requires: pango
-Libs: -L${libdir} -lpangox @X_LIBS@
-Cflags:
+VERSION="@VERSION@"
+REQUIRES="pango"
+CFLAGS=""
+LIBS_PATH="-L${libdir}"
+LIBS_SELF_LIBS="-lpangox"
+LIBS_SYSTEM_LIBS="@X_LIBS@"
+
+#Name: Pango X
+#Description: X Window System font support for Pango