diff options
author | Stanislav Brabec <sbrabec@suse.cz> | 2005-10-02 20:10:24 +0000 |
---|---|---|
committer | Rodney Dawes <dobey@src.gnome.org> | 2005-10-02 20:10:24 +0000 |
commit | f1095a928edbc3ff08c12a29df458c1ed56e39da (patch) | |
tree | a05128030f40791e7ce07b113618dc23fbc07886 | |
parent | 22f50a69b0be1b0ffffe24d6c779b95651c8298b (diff) | |
download | adwaita-icon-theme-f1095a928edbc3ff08c12a29df458c1ed56e39da.tar.gz |
Install gnome-icon-theme.pc to $(datadir)/pkgconfig
2005-10-02 Stanislav Brabec <sbrabec@suse.cz>
* Makefile.am: Install gnome-icon-theme.pc to $(datadir)/pkgconfig
* configure.in: Require pkg-config 0.19 for bug fixes and support for
installing pc files into $(datadir)/pkgconfig
* gnome-icon-theme.pc.in: Remove all the path variables as we don't
need theme for gnome-icon-theme since implementations should follow
the Icon Theme specification, and we don't install libraries or headers
Fixes #316200
-rw-r--r-- | ChangeLog | 13 | ||||
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | configure.in | 1 | ||||
-rw-r--r-- | gnome-icon-theme.pc.in | 5 |
4 files changed, 15 insertions, 6 deletions
@@ -1,5 +1,18 @@ 2005-10-02 Stanislav Brabec <sbrabec@suse.cz> + * Makefile.am: Install gnome-icon-theme.pc to $(datadir)/pkgconfig + + * configure.in: Require pkg-config 0.19 for bug fixes and support for + installing pc files into $(datadir)/pkgconfig + + * gnome-icon-theme.pc.in: Remove all the path variables as we don't + need theme for gnome-icon-theme since implementations should follow + the Icon Theme specification, and we don't install libraries or headers + + Fixes #316200 + +2005-10-02 Stanislav Brabec <sbrabec@suse.cz> + * 16x16/stock/io/Makefile.am: * 16x16/stock/net/Makefile.am: * 24x24/stock/io/Makefile.am: diff --git a/Makefile.am b/Makefile.am index 542a7f61e..e50ee582b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = 12x12 16x16 24x24 32x32 36x36 48x48 72x72 96x96 192x192 scalable po -pkgconfigdir = $(libdir)/pkgconfig +pkgconfigdir = $(datadir)/pkgconfig pkgconfig_DATA = gnome-icon-theme.pc THEME_IN_FILES=index.theme.in diff --git a/configure.in b/configure.in index b18dd6bfc..103ea33e8 100644 --- a/configure.in +++ b/configure.in @@ -9,6 +9,7 @@ AM_INIT_AUTOMAKE([1.9 tar-ustar]) AC_PROG_INTLTOOL AC_PROG_LN_S +PKG_PROG_PKG_CONFIG([0.19]) LN_S="$LN_S -f" AC_SUBST([LN_S]) diff --git a/gnome-icon-theme.pc.in b/gnome-icon-theme.pc.in index ab4ce227d..93f39b7a1 100644 --- a/gnome-icon-theme.pc.in +++ b/gnome-icon-theme.pc.in @@ -1,8 +1,3 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - Name: gnome-icon-theme Description: A collection of icons used as the basis for GNOME themes Version: @VERSION@ |