aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkbdata.src/Makefile.am
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-03-28 15:29:51 +0000
committermarha <marha@users.sourceforge.net>2010-03-28 15:29:51 +0000
commitc47c66de219162dd624593db5c5702f34539c7db (patch)
tree91a4a56726ed460718bd7077f05cd0339cfc0ad3 /xorg-server/xkbdata.src/Makefile.am
parentd335230702f56789a45c3f3ea8af0eefdcc8f6f4 (diff)
downloadvcxsrv-c47c66de219162dd624593db5c5702f34539c7db.tar.gz
vcxsrv-c47c66de219162dd624593db5c5702f34539c7db.tar.bz2
vcxsrv-c47c66de219162dd624593db5c5702f34539c7db.zip
svn merge -r507:HEAD ^/branches/released .
Diffstat (limited to 'xorg-server/xkbdata.src/Makefile.am')
-rw-r--r--xorg-server/xkbdata.src/Makefile.am43
1 files changed, 16 insertions, 27 deletions
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