aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/config/Makefile.am
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-11-30 10:03:09 +0000
committermarha <marha@users.sourceforge.net>2010-11-30 10:03:09 +0000
commit3e2f3f105cfe65384d2adeb2bd678850d9be47f9 (patch)
tree1c3e43a774683e6e47cbd2293679b7115fbaa3cb /xorg-server/config/Makefile.am
parentfed109d6a33c0871291d1bb2f3f6b7a3d1a3e9d7 (diff)
parent57818d0fe4f7cf94279909f03ec11b326b284f1e (diff)
downloadvcxsrv-3e2f3f105cfe65384d2adeb2bd678850d9be47f9.tar.gz
vcxsrv-3e2f3f105cfe65384d2adeb2bd678850d9be47f9.tar.bz2
vcxsrv-3e2f3f105cfe65384d2adeb2bd678850d9be47f9.zip
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/config/Makefile.am')
-rw-r--r--xorg-server/config/Makefile.am2
1 files changed, 2 insertions, 0 deletions
diff --git a/xorg-server/config/Makefile.am b/xorg-server/config/Makefile.am
index d8a7b45f6..72d22346b 100644
--- a/xorg-server/config/Makefile.am
+++ b/xorg-server/config/Makefile.am
@@ -9,8 +9,10 @@ AM_CFLAGS += $(UDEV_CFLAGS)
libconfig_la_SOURCES += udev.c
libconfig_la_LIBADD = $(UDEV_LIBS)
+if XORG
xorgconfddir = $(datadir)/X11/$(XF86CONFIGDIR)
xorgconfd_DATA = 10-evdev.conf
+endif
else