summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Horák <dan@danny.cz>2010-06-22 19:45:26 +0200
committerPeter Hutterer <peter.hutterer@who-t.net>2010-11-19 11:11:04 +1000
commitecdbe817fd7eb53fd1e7485c0492355f7f002d2a (patch)
tree76f47595d8de359c7243197035f97794a31bb5a0
parent38c46ccf796462d068d95acb9022de2acfc3a1f7 (diff)
XF86CONFIGDIR is undefined when built with --disable-xorg (#28672)
The 10-evdev.conf file gets installed as /usr/share/X11/10-evdev.conf on platforms that built the server with --disable-xorg like s390/s390x. The definition/installation should be guarded with "if XORG" because it makes sense only when built with xorg. X.Org Bug 28672 <http://bugs.freedesktop.org/show_bug.cgi?id=28672> Signed-off-by: Dan Horák <dan@danny.cz> Acked-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--config/Makefile.am2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/Makefile.am b/config/Makefile.am
index e1f1c4e16..4a2e873db 100644
--- a/config/Makefile.am
+++ b/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