blob: 6c76c0a057082501e2dee1bf0b8fa0cffaba9df8 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
|
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-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
+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 -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-09 11:06:41.000000000 -0400
@@ -163,7 +163,7 @@ schema_DATA = $(schema_in_files:.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)
|
