brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use the correct directory when installing keybindings. (#454055)

Browse Source 
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
This commit is contained in:
Matthias Clasen 2007-07-24 02:41:33 +00:00 committed by Matthias Clasen
parent 2d74cdc026
commit e98e38d32e
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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> 2007-07-22 Thomas Thurman <thomas@thurman.org.uk>
* configure.in: post-release bump to 2.19.55. * configure.in: post-release bump to 2.19.55.

7
configure.in
View File

@ -176,6 +176,13 @@ else
AC_MSG_ERROR("Pango 1.2.0 or greater based on Xft2 is required") AC_MSG_ERROR("Pango 1.2.0 or greater based on Xft2 is required")
fi 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 STARTUP_NOTIFICATION_VERSION=0.7
AC_MSG_CHECKING([Startup notification library >= $STARTUP_NOTIFICATION_VERSION]) AC_MSG_CHECKING([Startup notification library >= $STARTUP_NOTIFICATION_VERSION])
if $PKG_CONFIG --atleast-version $STARTUP_NOTIFICATION_VERSION libstartup-notification-1.0; then if $PKG_CONFIG --atleast-version $STARTUP_NOTIFICATION_VERSION libstartup-notification-1.0; then

2
src/Makefile.am
View File

@ -163,7 +163,7 @@ schema_DATA = $(schema_in_files:.schemas.in=.schemas)
@INTLTOOL_XML_NOMERGE_RULE@ @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_in_files = 50-metacity-desktop-key.xml.in 50-metacity-key.xml.in
xml_DATA = $(xml_in_files:.xml.in=.xml) xml_DATA = $(xml_in_files:.xml.in=.xml)