From f413dff57e77e7b01461508f74b4e92d1dc8defd Mon Sep 17 00:00:00 2001 From: "Sergey V. Udaltsov" Date: Mon, 1 Feb 2010 23:40:54 +0000 Subject: [PATCH] no need to create xkbcomp symlink anymore Request from Peter Hutterer - no need to create xkb symlink any more. See this thread: http://lists.x.org/archives/xorg-devel/2010-January/005294.html --- Makefile.am | 11 ----------- configure.in | 7 ------- 2 files changed, 18 deletions(-) diff --git a/Makefile.am b/Makefile.am index b044dc1..a505587 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,16 +12,5 @@ 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 diff --git a/configure.in b/configure.in index fef868b..f74e946 100644 --- a/configure.in +++ b/configure.in @@ -19,11 +19,6 @@ AC_ARG_WITH( xkb_rules_symlink, [ --with-xkb-rules-symlink=NAME1(,NAME2)* create symlink(s) to "old style" rules files (xfree86 and/or xorg)], xkb_rules_symlink="$withval" ) -AC_ARG_ENABLE( xkbcomp_symlink, - [ --enable-xkbcomp-symlink create xkbcomp symlink to $(xkb_base)../../../bin/xkbcomp], - enable_xkbcomp_symlink="$enableval", - enable_xkbcomp_symlink="yes" ) - AC_ARG_ENABLE( compat_rules, [ --enable-compat-rules create compatibility rules], enable_compat_rules="$enableval", @@ -31,8 +26,6 @@ AC_ARG_ENABLE( compat_rules, AM_CONDITIONAL(CREATE_RULES_SYMLINK, test "x$xkb_rules_symlink" != "x") -AM_CONDITIONAL(CREATE_XKBCOMP_SYMLINK, test "x$enable_xkbcomp_symlink" = "xyes") - AM_CONDITIONAL(USE_COMPAT_RULES, test "x$enable_compat_rules" = "xyes") # **** -- 2.7.4