From e65179c0d562448210ec7563e9433f8494751f76 Mon Sep 17 00:00:00 2001 From: Martin Baulig Date: Sat, 30 Sep 2000 02:09:40 +0000 Subject: [PATCH] Use the correct pkg-config syntax in all the *.pc.in files (the version that comes with the RedHat 7.0 glib-gtkbeta RPM). --- ChangeLog | 2 +- ChangeLog.pre-2-0 | 2 +- ChangeLog.pre-2-10 | 2 +- ChangeLog.pre-2-12 | 2 +- ChangeLog.pre-2-2 | 2 +- ChangeLog.pre-2-4 | 2 +- ChangeLog.pre-2-6 | 2 +- ChangeLog.pre-2-8 | 2 +- Makefile.am | 2 +- glib.pc.in | 13 +++++-------- glib/Makefile.am | 2 +- gmodule.pc.in | 15 ++++++--------- gthread.pc.in | 15 ++++++--------- 13 files changed, 27 insertions(+), 36 deletions(-) diff --git a/ChangeLog b/ChangeLog index 800785cd8..4d25d64dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,7 +6,7 @@ * configure.in: Create *.pc scripts from the *.pc.in templates. * Makefile.am (pkgconfig_DATA): Install the *.pc - scripts in `$(libexecdir)/pkgconfig'. + scripts in `$(libdir)/pkgconfig'. Fri Sep 8 21:46:13 2000 Owen Taylor diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 800785cd8..4d25d64dd 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -6,7 +6,7 @@ * configure.in: Create *.pc scripts from the *.pc.in templates. * Makefile.am (pkgconfig_DATA): Install the *.pc - scripts in `$(libexecdir)/pkgconfig'. + scripts in `$(libdir)/pkgconfig'. Fri Sep 8 21:46:13 2000 Owen Taylor diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 800785cd8..4d25d64dd 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -6,7 +6,7 @@ * configure.in: Create *.pc scripts from the *.pc.in templates. * Makefile.am (pkgconfig_DATA): Install the *.pc - scripts in `$(libexecdir)/pkgconfig'. + scripts in `$(libdir)/pkgconfig'. Fri Sep 8 21:46:13 2000 Owen Taylor diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 800785cd8..4d25d64dd 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -6,7 +6,7 @@ * configure.in: Create *.pc scripts from the *.pc.in templates. * Makefile.am (pkgconfig_DATA): Install the *.pc - scripts in `$(libexecdir)/pkgconfig'. + scripts in `$(libdir)/pkgconfig'. Fri Sep 8 21:46:13 2000 Owen Taylor diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 800785cd8..4d25d64dd 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -6,7 +6,7 @@ * configure.in: Create *.pc scripts from the *.pc.in templates. * Makefile.am (pkgconfig_DATA): Install the *.pc - scripts in `$(libexecdir)/pkgconfig'. + scripts in `$(libdir)/pkgconfig'. Fri Sep 8 21:46:13 2000 Owen Taylor diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 800785cd8..4d25d64dd 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -6,7 +6,7 @@ * configure.in: Create *.pc scripts from the *.pc.in templates. * Makefile.am (pkgconfig_DATA): Install the *.pc - scripts in `$(libexecdir)/pkgconfig'. + scripts in `$(libdir)/pkgconfig'. Fri Sep 8 21:46:13 2000 Owen Taylor diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 800785cd8..4d25d64dd 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -6,7 +6,7 @@ * configure.in: Create *.pc scripts from the *.pc.in templates. * Makefile.am (pkgconfig_DATA): Install the *.pc - scripts in `$(libexecdir)/pkgconfig'. + scripts in `$(libdir)/pkgconfig'. Fri Sep 8 21:46:13 2000 Owen Taylor diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 800785cd8..4d25d64dd 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -6,7 +6,7 @@ * configure.in: Create *.pc scripts from the *.pc.in templates. * Makefile.am (pkgconfig_DATA): Install the *.pc - scripts in `$(libexecdir)/pkgconfig'. + scripts in `$(libdir)/pkgconfig'. Fri Sep 8 21:46:13 2000 Owen Taylor diff --git a/Makefile.am b/Makefile.am index 773d5a1e0..3a6e201f7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -90,7 +90,7 @@ testgdateparser_LDADD = libglib.la m4datadir = $(datadir)/aclocal m4data_DATA = glib.m4 -pkgconfigdir = $(libexecdir)/pkgconfig +pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = glib.pc gmodule.pc gthread.pc glibconfig.h.win32: $(top_builddir)/config.status $(top_srcdir)/glibconfig.h.win32.in diff --git a/glib.pc.in b/glib.pc.in index ff339b78b..4f62b48b0 100644 --- a/glib.pc.in +++ b/glib.pc.in @@ -3,12 +3,9 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -VERSION="@VERSION@" -REQUIRES="" -CFLAGS="-I${includedir}/glib-1.2 -I${libdir}/glib/include $CFLAGS" -LIBS_PATH="-L${libdir} $LIBS_PATH" -LIBS_LINK_SELF="-lglib-1.2 $LIBS_LINK_SELF" -LIBS_LINK_SYSTEM="$LIBS_LINK_SYSTEM" +Name: GLib +Description: C Utility Library +Version: @VERSION@ +Libs: -L${libdir} -lglib-1.2 +Cflags: -I${includedir}/glib-1.2 -I${libdir}/glib/include -#Name: GLib -#Description: C Utility Library diff --git a/glib/Makefile.am b/glib/Makefile.am index 773d5a1e0..3a6e201f7 100644 --- a/glib/Makefile.am +++ b/glib/Makefile.am @@ -90,7 +90,7 @@ testgdateparser_LDADD = libglib.la m4datadir = $(datadir)/aclocal m4data_DATA = glib.m4 -pkgconfigdir = $(libexecdir)/pkgconfig +pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = glib.pc gmodule.pc gthread.pc glibconfig.h.win32: $(top_builddir)/config.status $(top_srcdir)/glibconfig.h.win32.in diff --git a/gmodule.pc.in b/gmodule.pc.in index 47259ef14..ed81d5cc7 100644 --- a/gmodule.pc.in +++ b/gmodule.pc.in @@ -3,12 +3,9 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -REQUIRES="glib" -VERSION="@VERSION@" -CFLAGS="$CFLAGS" -LIBS_PATH="-L${libdir} @G_MODULE_LDFLAGS@ $LIBS_PATH" -LIBS_LINK_SELF="-lgmodule-1.2 $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 +Version: @VERSION@ +Libs: -L${libdir} @G_MODULE_LDFLAGS@ -lgmodule-1.2 @G_MODULE_LIBS@ +Cflags: diff --git a/gthread.pc.in b/gthread.pc.in index b5018b1cc..ca9f5e9e7 100644 --- a/gthread.pc.in +++ b/gthread.pc.in @@ -3,12 +3,9 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -REQUIRES="glib" -VERSION="@VERSION@" -CFLAGS="$CFLAGS" -LIBS_PATH="-L${libdir} $LIBS_PATH" -LIBS_LINK_SELF="-lgthread-1.2 $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 +Version: @VERSION@ +Libs: -L${libdir} -lgthread-1.2 @G_THREAD_LIBS@ +Cflags: