meson: create dirs and touch /usr

This is the equivalent of $(INSTALL_DIRS) and install-touch-usr-hook.
I did not bother to create the directories into which we install files,
since they will be created anyway.

v2:
- remove bashism

diff --git a/hwdb/meson.build b/hwdb/meson.build
index 4c13a2e7a94d46edab38aa63cf6bf49ac623b3b6..bffac3bae628b7947fe93b79422ae1f427a2b041 100644 (file)
--- a/hwdb/meson.build
+++ b/hwdb/meson.build
@@ -22,4 +22,7 @@ hwdb_files = files('''
 if conf.get('ENABLE_HWDB', 0) == 1
   install_data(hwdb_files,
                install_dir : udevhwdbdir)
+
+  meson.add_install_script('sh', '-c',
+                           mkdir_p.format(sysconfdir + '/udev/hwdb.d'))
 endif

diff --git a/meson.build b/meson.build
index e2e28438b78856b9f4cc3d17832dd38c2d676ccf..a5b57d8e057d6b4f07993ad2b18ec94b136cdf24 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -385,6 +385,8 @@ stat = find_program('stat')
 git = find_program('git', required : false)
 etags = find_program('etags', required : false)
 
+mkdir_p = 'mkdir -p $DESTDIR/@0@'
+
 # if -Dxxx-path option is found, use that. Otherwise, check in $PATH,
 # /usr/sbin, /sbin, and fall back to the default from middle column.
 progs = [['telinit',    '/lib/sysvinit/telinit'],
@@ -1530,6 +1532,11 @@ if conf.get('ENABLE_BINFMT', 0) == 1
              link_with : [libshared],
              install : true,
              install_dir : rootlibexecdir)
+
+  meson.add_install_script('sh', '-c',
+                           mkdir_p.format(binfmtdir))
+  meson.add_install_script('sh', '-c',
+                           mkdir_p.format(sysconfdir + '/binfmt.d'))
 endif
 
 if conf.get('ENABLE_VCONSOLE', 0) == 1
@@ -1821,6 +1828,11 @@ if conf.get('HAVE_KMOD', 0) == 1
              dependencies : [libkmod],
              install : true,
              install_dir : rootlibexecdir)
+
+  meson.add_install_script('sh', '-c',
+                           mkdir_p.format(modulesloaddir))
+  meson.add_install_script('sh', '-c',
+                           mkdir_p.format(sysconfdir + '/modules-load.d'))
 endif
 
 executable('systemd-nspawn',
@@ -1941,6 +1953,9 @@ install_data('README',
              'src/libsystemd/sd-bus/GVARIANT-SERIALIZATION',
              install_dir : docdir)
 
+meson.add_install_script('sh', '-c', mkdir_p.format(systemdstatedir))
+meson.add_install_script('sh', '-c', 'touch $DESTDIR@0@'.format(prefixdir))
+
 ############################################################
 
 if git.found() and etags.found()

diff --git a/network/meson.build b/network/meson.build
index b578159b037ee6242691631c298a4a7eff2a6a1e..d2eb89ad4da5aa4ca70f0a08dbeb6395055af698 100644 (file)
--- a/network/meson.build
+++ b/network/meson.build
@@ -6,4 +6,7 @@ if conf.get('ENABLE_NETWORKD', 0) == 1
                '80-container-vz.network',
                '99-default.link',
                install_dir : networkdir)
+
+  meson.add_install_script('sh', '-c',
+                           mkdir_p.format(sysconfdir + '/systemd/network'))
 endif

diff --git a/src/core/meson.build b/src/core/meson.build
index f6d3e7fb00665efc926b728124963452f64673c0..bf4e2dbed9b2b46ea774c45947e6565433374457 100644 (file)
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@ -220,3 +220,17 @@ custom_target(
 install_data('system.conf',
              'user.conf',
              install_dir : pkgsysconfdir)
+
+meson.add_install_script('sh', '-c', mkdir_p.format(systemshutdowndir))
+meson.add_install_script('sh', '-c', mkdir_p.format(systemsleepdir))
+meson.add_install_script('sh', '-c', mkdir_p.format(systemgeneratordir))
+meson.add_install_script('sh', '-c', mkdir_p.format(usergeneratordir))
+
+meson.add_install_script('sh', '-c',
+                         mkdir_p.format(pkgsysconfdir + '/system/multi-user.target.wants'))
+meson.add_install_script('sh', '-c',
+                         mkdir_p.format(pkgsysconfdir + '/system/getty.target.wants'))
+meson.add_install_script('sh', '-c',
+                         mkdir_p.format(pkgsysconfdir + '/user'))
+meson.add_install_script('sh', '-c',
+                         mkdir_p.format(sysconfdir + '/xdg/systemd'))

diff --git a/src/kernel-install/meson.build b/src/kernel-install/meson.build
index 517cd69c0e8ea339db53a97aeffc10dd0a82f643..4ecea20f8929d863bac6e98ef4ef19c74d92a7ad 100644 (file)
--- a/src/kernel-install/meson.build
+++ b/src/kernel-install/meson.build
@@ -8,3 +8,6 @@ install_data('50-depmod.install',
              '90-loaderentry.install',
              install_mode : 'rwxr-xr-x',
              install_dir : kernelinstalldir)
+
+meson.add_install_script('sh', '-c',
+                         mkdir_p.format(sysconfdir + '/kernel/install.d'))

diff --git a/src/udev/meson.build b/src/udev/meson.build
index 6edec7dabcfd1a821d874859735af6e7fd071541..f3c68a9d4583486eaa0be947f4166d95af936306 100644 (file)
--- a/src/udev/meson.build
+++ b/src/udev/meson.build
@@ -163,3 +163,6 @@ udev_pc = configure_file(
     configuration : substs)
 install_data(udev_pc,
              install_dir : pkgconfigdatadir)
+
+meson.add_install_script('sh', '-c',
+                         mkdir_p.format(sysconfdir + '/udev/rules.d'))

diff --git a/sysctl.d/meson.build b/sysctl.d/meson.build
index a8cf868a9bf1811d567b3f115ae310c2788b4a57..cdd95f857a9fbf14b225e2fc9241c0526fdd7cd4 100644 (file)
--- a/sysctl.d/meson.build
+++ b/sysctl.d/meson.build
@@ -18,3 +18,6 @@ foreach file : in_files
   install_data(gen,
                install_dir : sysctldir)
 endforeach
+
+meson.add_install_script('sh', '-c',
+                         mkdir_p.format(sysconfdir + '/sysctl.d'))

diff --git a/tmpfiles.d/meson.build b/tmpfiles.d/meson.build
index cba5e1781d03b3c5c0baa9e2058231cb4e642ac0..36a053bc0e08cf49f45344a54c5b4a6f79ee13c1 100644 (file)
--- a/tmpfiles.d/meson.build
+++ b/tmpfiles.d/meson.build
@@ -37,3 +37,8 @@ foreach file : m4_files
     install : enable_tmpfiles,
     install_dir : tmpfilesdir)
 endforeach
+
+if enable_tmpfiles
+  meson.add_install_script('sh', '-c',
+                           mkdir_p.format(sysconfdir + '/tmpfiles.d'))
+endif

diff --git a/units/meson.build b/units/meson.build
index 3dfb9853f67c4bbd9b1a9ee9f10c4d0e50b393f7..957153c0b5c2328673471d0074439de29253a00e 100644 (file)
--- a/units/meson.build
+++ b/units/meson.build
@@ -307,4 +307,12 @@ foreach tuple : m4_in_units
   endif
 endforeach
 
+if conf.get('HAVE_SYSV_COMPAT', 0) == 1
+  foreach i : [1, 2, 3, 4, 5]
+    meson.add_install_script('sh', '-c',
+                             mkdir_p
+                             .format(systemunitdir + '/runlevel@0@.target.wants'.format(i)))
+  endforeach
+endif
+
 subdir('user')