localmacros are from the old system

2 files changed, 1 insertions, 38 deletions

diff --git a/keymap/sun_vndr/Makefile.am b/keymap/sun_vndr/Makefile.am
index 0049ad96..551162d3 100644
--- a/keymap/sun_vndr/Makefile.am
+++ b/keymap/sun_vndr/Makefile.am
@@ -1,7 +1,7 @@
 keymapdir = $(xkb_base)/keymap/sun_vndr
 
 dist_keymap_DATA = \
-de es fi \
+all de es fi \
 fr no pl \
 ru se uk \
 us
diff --git a/keymap/sun_vndr/localmacros b/keymap/sun_vndr/localmacros
deleted file mode 100644
index 7cb696c3..00000000
--- a/keymap/sun_vndr/localmacros
+++ /dev/null
@@ -1,37 +0,0 @@
-XCOMM ########################################################################
-XCOMM
-XCOMM Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-XCOMM
-XCOMM Permission is hereby granted, free of charge, to any person obtaining a
-XCOMM copy of this software and associated documentation files (the
-XCOMM "Software"), to deal in the Software without restriction, including
-XCOMM without limitation the rights to use, copy, modify, merge, publish,
-XCOMM distribute, and/or sell copies of the Software, and to permit persons
-XCOMM to whom the Software is furnished to do so, provided that the above
-XCOMM copyright notice(s) and this permission notice appear in all copies of
-XCOMM the Software and that both the above copyright notice(s) and this
-XCOMM permission notice appear in supporting documentation.
-XCOMM
-XCOMM THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-XCOMM OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-XCOMM MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-XCOMM OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-XCOMM HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-XCOMM INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-XCOMM FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-XCOMM NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-XCOMM WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-XCOMM
-XCOMM Except as contained in this notice, the name of a copyright holder
-XCOMM shall not be used in advertising or otherwise to promote the sale, use
-XCOMM or other dealings in this Software without prior written authorization
-XCOMM of the copyright holder.
-XCOMM
-XCOMM ########################################################################
-XCOMM
-XCOMM ident "@(#)localmacros 1.2     05/11/08 SMI"
-XCOMM
-
-EXTRADATAFILES = all
-
-InstallMultiple($(EXTRADATAFILES),$(LIBDIR)/xkb/keymap/sun)