From c47c66de219162dd624593db5c5702f34539c7db Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Sun, 28 Mar 2010 15:29:51 +0000
Subject: svn merge -r507:HEAD ^/branches/released .

---
 xorg-server/xkbdata.src/Makefile.am | 43 ++++++++++++++-----------------------
 1 file changed, 16 insertions(+), 27 deletions(-)

(limited to 'xorg-server/xkbdata.src/Makefile.am')

diff --git a/xorg-server/xkbdata.src/Makefile.am b/xorg-server/xkbdata.src/Makefile.am
index b044dc1d2..48cdf4413 100644
--- a/xorg-server/xkbdata.src/Makefile.am
+++ b/xorg-server/xkbdata.src/Makefile.am
@@ -1,27 +1,16 @@
-AUTOMAKE_OPTIONS = foreign
-
-SUBDIRS = compat geometry keycodes keymap po rules semantics symbols types docs
-
-EXTRA_DIST=config.rpath COPYING CREDITS README \
-       autogen.sh \
-       xkeyboard-config.spec \
-       xkeyboard-config.spec.in \
-       intltool-extract.in intltool-merge.in intltool-update.in
-
-DISTCLEANFILES=intltool-extract intltool-merge intltool-update
-
-# ACLOCAL_AMFLAGS = -I m4
-
-if CREATE_XKBCOMP_SYMLINK
-install-xkbcomp:
-	ln -sf $(XKBCOMP) $(DESTDIR)$(xkb_base)/xkbcomp
-
-else
-install-xkbcomp:
-
-endif
-
-install-data-hook: install-xkbcomp
-
-sync-po:
-	rsync -Lrtvz translationproject.org::tp/latest/xkeyboard-config/  po
+AUTOMAKE_OPTIONS = foreign
+
+SUBDIRS = compat geometry keycodes keymap po rules semantics symbols types docs
+
+EXTRA_DIST=config.rpath COPYING CREDITS README \
+       autogen.sh \
+       xkeyboard-config.spec \
+       xkeyboard-config.spec.in \
+       intltool-extract.in intltool-merge.in intltool-update.in
+
+DISTCLEANFILES=intltool-extract intltool-merge intltool-update
+
+# ACLOCAL_AMFLAGS = -I m4
+
+sync-po:
+	rsync -Lrtvz translationproject.org::tp/latest/xkeyboard-config/  po
-- 
cgit v1.2.3