diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2007-07-24 02:41:33 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2007-07-24 02:41:33 +0000 |
| commit | e98e38d32e4493a57e07245fb6069d4ca305c5b5 (patch) | |
| tree | 189c8ce45f15d6e4f5893600a6a12e58294bbe6c | |
| parent | 2d74cdc0266b4dcd79d00ecfd2cac7aecfb4ed9e (diff) | |
| download | metacity-e98e38d32e4493a57e07245fb6069d4ca305c5b5.tar.gz | |
Use the correct directory when installing keybindings. (#454055)
2007-07-23 Matthias Clasen <mclasen@redhat.com>
* configure.in:
* src/Makefile.am: Use the correct directory when
installing keybindings. (#454055)
svn path=/trunk/; revision=3278
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.in | 7 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
3 files changed, 14 insertions, 1 deletions
@@ -1,3 +1,9 @@ +2007-07-23 Matthias Clasen <mclasen@redhat.com> + + * configure.in: + * src/Makefile.am: Use the correct directory when + installing keybindings. (#454055) + 2007-07-22 Thomas Thurman <thomas@thurman.org.uk> * configure.in: post-release bump to 2.19.55. diff --git a/configure.in b/configure.in index ff906304..13752c8d 100644 --- a/configure.in +++ b/configure.in @@ -176,6 +176,13 @@ else AC_MSG_ERROR("Pango 1.2.0 or greater based on Xft2 is required") fi +if $PKG_CONFIG --exists gnome-keybindings; then + GNOME_KEYBINDINGS_KEYSDIR=$($PKG_CONFIG --variable keysdir gnome-keybindings) +else + GNOME_KEYBINDINGS_KEYSDIR="${datadir}/gnome-control-center/keybindings" +fi +AC_SUBST(GNOME_KEYBINDINGS_KEYSDIR) + STARTUP_NOTIFICATION_VERSION=0.7 AC_MSG_CHECKING([Startup notification library >= $STARTUP_NOTIFICATION_VERSION]) if $PKG_CONFIG --atleast-version $STARTUP_NOTIFICATION_VERSION libstartup-notification-1.0; then diff --git a/src/Makefile.am b/src/Makefile.am index 40b349ed..bfcbef55 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -163,7 +163,7 @@ schema_DATA = $(schema_in_files:.schemas.in=.schemas) @INTLTOOL_XML_NOMERGE_RULE@ -xmldir = $(datadir)/control-center/keybindings +xmldir = @GNOME_KEYBINDINGS_KEYSDIR@ xml_in_files = 50-metacity-desktop-key.xml.in 50-metacity-key.xml.in xml_DATA = $(xml_in_files:.xml.in=.xml) |