X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fsystemd.git;a=blobdiff_plain;f=hwdb%2Fmeson.build;h=a5175039cd97173abca6109bdc80e995e9032487;hp=4498d5e08b9495af5b1b8931103baa2b3f063033;hb=349cc4a507c4d84fcadf61f42159ea6412717896;hpb=abba22c51c44871395316a73cf0e69106eeb94a1

diff --git a/hwdb/meson.build b/hwdb/meson.build
index 4498d5e08b9..a5175039cd9 100644
--- a/hwdb/meson.build
+++ b/hwdb/meson.build
@@ -1,35 +1,44 @@
-# -*- mode: meson -*-
-
 hwdb_files = files('''
-  20-pci-vendor-model.hwdb
-  20-pci-classes.hwdb
-  20-usb-vendor-model.hwdb
-  20-usb-classes.hwdb
-  20-sdio-vendor-model.hwdb
-  20-sdio-classes.hwdb
-  20-bluetooth-vendor-product.hwdb
-  20-acpi-vendor.hwdb
-  20-OUI.hwdb
-  20-net-ifname.hwdb
-  60-evdev.hwdb
-  60-keyboard.hwdb
-  60-sensor.hwdb
-  70-mouse.hwdb
-  70-pointingstick.hwdb
-  70-touchpad.hwdb
+        20-pci-vendor-model.hwdb
+        20-pci-classes.hwdb
+        20-usb-vendor-model.hwdb
+        20-usb-classes.hwdb
+        20-sdio-vendor-model.hwdb
+        20-sdio-classes.hwdb
+        20-bluetooth-vendor-product.hwdb
+        20-acpi-vendor.hwdb
+        20-OUI.hwdb
+        20-net-ifname.hwdb
+        60-evdev.hwdb
+        60-keyboard.hwdb
+        60-sensor.hwdb
+        70-joystick.hwdb
+        70-mouse.hwdb
+        70-pointingstick.hwdb
+        70-touchpad.hwdb
 '''.split())
 
-if conf.get('ENABLE_HWDB', 0) == 1
-  install_data(hwdb_files,
-               install_dir : udevhwdbdir)
+if conf.get('ENABLE_HWDB') == 1
+        install_data(hwdb_files,
+                     install_dir : udevhwdbdir)
+
+        meson.add_install_script('sh', '-c',
+                                 mkdir_p.format(join_paths(sysconfdir, 'udev/hwdb.d')))
 
-  meson.add_install_script('sh', '-c',
-                           mkdir_p.format(join_paths(sysconfdir, 'udev/hwdb.d')))
+        meson.add_install_script('sh', '-c',
+                                 'test -n "$DESTDIR" || @0@/systemd-hwdb update'
+                                 .format(rootbindir))
 endif
 
 ############################################################
 
-custom_target(
-  'update',
-  output : 'update',
-  command : [hwdb_update_sh, meson.current_source_dir()])
+parse_hwdb_py = find_program('parse_hwdb.py')
+test('parse-hwdb',
+     parse_hwdb_py,
+     timeout : 90)
+
+############################################################
+
+run_target(
+        'hwdb-update',
+        command : [hwdb_update_sh, meson.current_source_dir()])