summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2010-06-02 12:57:38 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2010-06-02 12:57:38 +1000
commit144210ab4962c5b00fea4fdc4f01050841a8d67c (patch)
treea036078b6ee52133d6146099663229e8693b9229
parenta489ec15eb489a3528f6fee99716f7f4ae35f9ee (diff)
parentdead313d15a7c9ccf59009eef4202503741a1b5f (diff)
Merge branch 'master' of git://people.freedesktop.org/~gnadon/xf86-input-synaptics
-rw-r--r--conf/Makefile.am7
1 files changed, 4 insertions, 3 deletions
diff --git a/conf/Makefile.am b/conf/Makefile.am
index 6c571d0..38d2a01 100644
--- a/conf/Makefile.am
+++ b/conf/Makefile.am
@@ -20,7 +20,8 @@
if HAS_XORG_CONF_DIR
-config_DATA = 50-synaptics.conf
+dist_config_DATA = 50-synaptics.conf
+else
+fdidir = $(datadir)/hal/fdi/policy/20thirdparty
+dist_fdi_DATA = 11-x11-synaptics.fdi
endif
-
-EXTRA_DIST = 50-synaptics.conf 11-x11-synaptics.fdi