diff options
Diffstat (limited to 'keysdir.patch')
| -rw-r--r-- | keysdir.patch | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/keysdir.patch b/keysdir.patch index 0726f58..6c76c0a 100644 --- a/keysdir.patch +++ b/keysdir.patch @@ -1,11 +1,15 @@ diff -up metacity-2.19.21/configure.in.keysdir metacity-2.19.21/configure.in --- metacity-2.19.21/configure.in.keysdir 2007-06-10 23:34:39.000000000 -0400 -+++ metacity-2.19.21/configure.in 2007-07-05 16:50:29.000000000 -0400 -@@ -176,6 +176,9 @@ else ++++ metacity-2.19.21/configure.in 2007-07-09 11:08:26.000000000 -0400 +@@ -176,6 +176,13 @@ else AC_MSG_ERROR("Pango 1.2.0 or greater based on Xft2 is required") fi -+GNOME_KEYBINDINGS_KEYSDIR=$($PKG_CONFIG --variable keysdir gnome-keybindings) ++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 @@ -13,7 +17,7 @@ diff -up metacity-2.19.21/configure.in.keysdir metacity-2.19.21/configure.in if $PKG_CONFIG --atleast-version $STARTUP_NOTIFICATION_VERSION libstartup-notification-1.0; then diff -up metacity-2.19.21/src/Makefile.am.keysdir metacity-2.19.21/src/Makefile.am --- metacity-2.19.21/src/Makefile.am.keysdir 2007-04-05 14:45:12.000000000 -0400 -+++ metacity-2.19.21/src/Makefile.am 2007-07-05 16:51:07.000000000 -0400 ++++ metacity-2.19.21/src/Makefile.am 2007-07-09 11:06:41.000000000 -0400 @@ -163,7 +163,7 @@ schema_DATA = $(schema_in_files:.schemas @INTLTOOL_XML_NOMERGE_RULE@ |