diff options
author | marha <marha@users.sourceforge.net> | 2010-04-02 13:46:21 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-04-02 13:46:21 +0000 |
commit | 0e9df5cfcee1ab569d7b41ea1af4eab3e31f099b (patch) | |
tree | 7f9e41630a661eaab39bef9023c2661a7281af96 /xorg-server/config/Makefile.am | |
parent | 8def4a30414ae76e228f285ccab8bba6de083d08 (diff) | |
download | vcxsrv-0e9df5cfcee1ab569d7b41ea1af4eab3e31f099b.tar.gz vcxsrv-0e9df5cfcee1ab569d7b41ea1af4eab3e31f099b.tar.bz2 vcxsrv-0e9df5cfcee1ab569d7b41ea1af4eab3e31f099b.zip |
svn merge -r522:HEAD ^/branches/released .
Diffstat (limited to 'xorg-server/config/Makefile.am')
-rw-r--r-- | xorg-server/config/Makefile.am | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/xorg-server/config/Makefile.am b/xorg-server/config/Makefile.am index 27f251b3a..eed745483 100644 --- a/xorg-server/config/Makefile.am +++ b/xorg-server/config/Makefile.am @@ -9,6 +9,9 @@ AM_CFLAGS += $(UDEV_CFLAGS) libconfig_la_SOURCES += udev.c libconfig_la_LIBADD = $(UDEV_LIBS) +xorgconfddir = $(prefix)/etc/X11/$(XF86CONFIGDIR) +xorgconfd_DATA = 10-evdev.conf + else if CONFIG_NEED_DBUS @@ -33,4 +36,4 @@ endif # CONFIG_NEED_DBUS endif # !CONFIG_UDEV -EXTRA_DIST = xorg-server.conf x11-input.fdi +EXTRA_DIST = xorg-server.conf x11-input.fdi 10-evdev.conf |