diff mbox series

[126/132] meson: install keymaps

Message ID 1576758232-12439-35-git-send-email-pbonzini@redhat.com
State New
Headers show
Series Proof of concept for Meson integration | expand

Commit Message

Paolo Bonzini Dec. 19, 2019, 12:23 p.m. UTC 
From: Marc-André Lureau <marcandre.lureau@redhat.com>

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 Makefile                    |  9 ---------
 pc-bios/keymaps/meson.build | 38 ++++++++++++++++++++++++++++++++++++++
 pc-bios/meson.build         |  1 +
 3 files changed, 39 insertions(+), 9 deletions(-)
 create mode 100644 pc-bios/keymaps/meson.build
diff mbox series

Patch

diff --git a/Makefile b/Makefile
index 8ebaacf..3faf6a4 100644
--- a/Makefile
+++ b/Makefile
@@ -217,11 +217,6 @@  distclean: clean
 	rm -Rf .sdk
 	if test -f dtc/version_gen.h; then $(MAKE) $(DTC_MAKE_ARGS) clean; fi
 
-KEYMAPS=da     en-gb  et  fr     fr-ch  is  lt  no  pt-br  sv \
-ar      de     en-us  fi  fr-be  hr     it  lv  nl         pl  ru     th \
-de-ch  es     fo  fr-ca  hu     ja  mk  pt  sl     tr \
-bepo    cz
-
 install-datadir:
 	$(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)"
 
@@ -243,10 +238,6 @@  endif
 ifdef CONFIG_GTK
 	$(MAKE) -C po $@
 endif
-	$(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/keymaps"
-	set -e; for x in $(KEYMAPS); do \
-		$(INSTALL_DATA) $(SRC_PATH)/pc-bios/keymaps/$$x "$(DESTDIR)$(qemu_datadir)/keymaps"; \
-	done
 
 .PHONY: ctags
 ctags:
diff --git a/pc-bios/keymaps/meson.build b/pc-bios/keymaps/meson.build
new file mode 100644
index 0000000..04c2a17
--- /dev/null
+++ b/pc-bios/keymaps/meson.build
@@ -0,0 +1,38 @@ 
+keymaps = [
+  'ar',
+  'bepo',
+  'cz',
+  'da',
+  'de',
+  'de-ch',
+  'en-gb',
+  'en-us',
+  'es',
+  'et',
+  'fi',
+  'fo',
+  'fr',
+  'fr-be',
+  'fr-ca',
+  'fr-ch',
+  'hr',
+  'hu',
+  'is',
+  'it',
+  'ja',
+  'lt',
+  'lv',
+  'mk',
+  'nl',
+  'no',
+  'pl',
+  'pt',
+  'pt-br',
+  'ru',
+  'sl',
+  'sv',
+  'th',
+  'tr',
+]
+
+install_data(keymaps, install_dir: config_host['qemu_datadir'] / 'keymaps')
diff --git a/pc-bios/meson.build b/pc-bios/meson.build
index 75475a6..9a46a8c 100644
--- a/pc-bios/meson.build
+++ b/pc-bios/meson.build
@@ -25,6 +25,7 @@  foreach f: fds
 endforeach
 
 subdir('descriptors')
+subdir('keymaps')
 
 blobs = files(
   'QEMU,cgthree.bin',