Signed-off-by: Daniel P. Berrange <berrange@xxxxxxxxxx>
---
configure.ac | 1 +
data/datamaps/Makefile.am | 8 +-------
data/datamaps/x.org/Makefile.am | 1 +
data/datamaps/{x11-keyboard.xml => x.org/x11-keyboard.xml.in} | 7 -------
4 files changed, 3 insertions(+), 14 deletions(-)
create mode 100644 data/datamaps/x.org/Makefile.am
rename data/datamaps/{x11-keyboard.xml => x.org/x11-keyboard.xml.in} (96%)
diff --git a/configure.ac b/configure.ac
index 9c21d54..d2c8c17 100644
--- a/configure.ac
+++ b/configure.ac
@@ -169,6 +169,7 @@ AC_CONFIG_FILES([
data/Makefile
data/datamaps/Makefile
data/datamaps/microsoft.com/Makefile
+ data/datamaps/x.org/Makefile
data/devices/Makefile
data/platforms/Makefile
data/platforms/linux-kvm.org/Makefile
diff --git a/data/datamaps/Makefile.am b/data/datamaps/Makefile.am
index 6099183..0061fe0 100644
--- a/data/datamaps/Makefile.am
+++ b/data/datamaps/Makefile.am
@@ -1,11 +1,5 @@
SUBDIRS = \
microsoft.com \
+ x.org \
$(NULL)
-
-datamapdir = $(pkgdatadir)/db/datamaps/
-datamap_DATA = \
- x11-keyboard.xml \
- $(NULL)
-
-EXTRA_DIST = $(datamap_DATA)
diff --git a/data/datamaps/x.org/Makefile.am b/data/datamaps/x.org/Makefile.am
new file mode 100644
index 0000000..ee4552b
--- /dev/null
+++ b/data/datamaps/x.org/Makefile.am
@@ -0,0 +1 @@
+include ../../Makefile.inc
diff --git a/data/datamaps/x11-keyboard.xml b/data/datamaps/x.org/x11-keyboard.xml.in
similarity index 96%
rename from data/datamaps/x11-keyboard.xml
rename to data/datamaps/x.org/x11-keyboard.xml.in
index e6bbc51..28cf201 100644
--- a/data/datamaps/x11-keyboard.xml
+++ b/data/datamaps/x.org/x11-keyboard.xml.in
@@ -1,11 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- The datamaps in this file will be used to map the GETTEXT locale
- codes to X11 keyboard layouts.
--->
-
<libosinfo version="0.0.1">
- <!-- GETTEXT locale to X11 keyboard layout mapping -->
<datamap id="http://x.org/x11-keyboard";>
<entry inval="af_ZA" outval="za"/>
<entry inval="ar_AE" outval="ae"/>
--
2.4.3
_______________________________________________
Libosinfo mailing list
Libosinfo@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libosinfo
