From a7d9950ae648c200ec01c18b9678649ba4ee12e1 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Mon, 30 Apr 2007 16:12:08 +0000 Subject: [PATCH] Generate a capplets/keybindings/gnome-keybindings.pc from the .in file 2007-04-30 Bastien Nocera * configure.in: Generate a capplets/keybindings/gnome-keybindings.pc from the .in file 2007-04-30 Bastien Nocera * Makefile.am: upd * gnome-keybindings.pc.in: add a noarch pkgconfig file to allow applications to know where to add their keybindings (Closes: #434591) svn path=/trunk/; revision=7519 --- ChangeLog | 5 +++++ capplets/keybindings/ChangeLog | 7 +++++++ capplets/keybindings/Makefile.am | 5 ++++- capplets/keybindings/gnome-keybindings.pc.in | 8 ++++++++ configure.in | 2 ++ 5 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 capplets/keybindings/gnome-keybindings.pc.in diff --git a/ChangeLog b/ChangeLog index 782522269..564d37bcc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-04-30 Bastien Nocera + + * configure.in: Generate a capplets/keybindings/gnome-keybindings.pc + from the .in file + 2007-04-30 Thomas Wood * capplets/appearance/Makefile.am: diff --git a/capplets/keybindings/ChangeLog b/capplets/keybindings/ChangeLog index b884ecc62..eb3250cc7 100644 --- a/capplets/keybindings/ChangeLog +++ b/capplets/keybindings/ChangeLog @@ -1,3 +1,10 @@ +2007-04-30 Bastien Nocera + + * Makefile.am: upd + * gnome-keybindings.pc.in: add a noarch pkgconfig file to allow + applications to know where to add their keybindings + (Closes: #434591) + 2007-04-27 Rodrigo Moya * keybinding.desktop.in.in: renamed Bugzilla product. diff --git a/capplets/keybindings/Makefile.am b/capplets/keybindings/Makefile.am index 2d525566f..38c7d8e57 100644 --- a/capplets/keybindings/Makefile.am +++ b/capplets/keybindings/Makefile.am @@ -26,6 +26,9 @@ xmldir = $(pkgdatadir)/keybindings xml_in_files = 00-multimedia-key.xml.in 01-desktop-key.xml.in xml_DATA = $(xml_in_files:.xml.in=.xml) +pkgconfigdir = $(datadir)/pkgconfig +pkgconfig_DATA = gnome-keybindings.pc + INCLUDES = \ $(GNOMECC_CAPPLETS_CFLAGS) \ -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \ @@ -33,5 +36,5 @@ INCLUDES = \ -DGNOMECC_GLADE_DIR="\"$(pkgdatadir)/glade\"" \ -DGNOMECC_KEYBINDINGS_DIR="\"$(pkgdatadir)/keybindings\"" CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) -EXTRA_DIST = $(Glade_DATA) $(xml_in_files) +EXTRA_DIST = $(Glade_DATA) $(xml_in_files) gnome-keybindings.pc.in diff --git a/capplets/keybindings/gnome-keybindings.pc.in b/capplets/keybindings/gnome-keybindings.pc.in new file mode 100644 index 000000000..9b292d017 --- /dev/null +++ b/capplets/keybindings/gnome-keybindings.pc.in @@ -0,0 +1,8 @@ +prefix=@prefix@ +pkgdatadir=@datadir@/@GETTEXT_PACKAGE@ +keysdir=${pkgdatadir}/keybindings + +Name: gnome-keybindings +Description: Keybindings configuration for GNOME applications +Version: @VERSION@ + diff --git a/configure.in b/configure.in index 228fdbb3a..310bcbb0b 100644 --- a/configure.in +++ b/configure.in @@ -10,6 +10,7 @@ AM_MAINTAINER_MODE AC_ISC_POSIX AC_PROG_CC +AM_PROG_CC_C_O AC_STDC_HEADERS AM_PROG_LIBTOOL @@ -546,6 +547,7 @@ vfs-methods/fontilus/gnome-font-viewer.desktop.in vfs-methods/themus/themus-theme-applier.desktop.in capplets/font/font-properties.desktop.in capplets/keybindings/keybinding.desktop.in +capplets/keybindings/gnome-keybindings.pc capplets/display/display-properties.desktop.in capplets/mouse/gnome-settings-mouse.desktop.in capplets/sound/gnome-settings-sound.desktop.in