summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorMark Hindley <mark@hindley.org.uk>2018-11-01 05:04:52 +0000
committerMark Hindley <mark@hindley.org.uk>2018-11-01 05:07:51 +0000
commit75c790ef2972088a9e8462a521dced806b5de6ec (patch)
tree31054c69a2900dbf64ab0195d93e0672eb4502c6 /src/core
parent6d97c489b9675603a45eb1ce7940d0a4e416fb71 (diff)
Revert in-tree changes to upstream src.
Diffstat (limited to 'src/core')
-rw-r--r--src/core/meson.build12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/core/meson.build b/src/core/meson.build
index 22a3c6ba5..10d29d5e6 100644
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@ -130,7 +130,7 @@ libcore_la_sources = files('''
'''.split())
#endif // 0
-#if 0 /// The rest is not needed by elogind, we use the sources directly in login
+#if 0 /// Almost the rest is not needed by elogind, we use the sources directly in login
# load_fragment_gperf_gperf = custom_target(
# 'load-fragment-gperf.gperf',
# input : 'load-fragment-gperf.gperf.m4',
@@ -218,8 +218,14 @@ libcore_la_sources = files('''
# install_data('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))
+#endif // 0
+meson.add_install_script('sh', '-c', mkdir_p.format(systemshutdowndir))
+meson.add_install_script('sh', '-c', mkdir_p.format(systemsleepdir))
+#if 1 /// some package sytems like portage might strip empty directories created for elogind
+meson.add_install_script('sh', '-c', 'touch $DESTDIR@0@/.keep_dir'.format(systemshutdowndir))
+meson.add_install_script('sh', '-c', 'touch $DESTDIR@0@/.keep_dir'.format(systemsleepdir))
+#endif // 1
+#if 0 /// UNNEEDED by elogind
# meson.add_install_script('sh', '-c', mkdir_p.format(systemgeneratordir))
# meson.add_install_script('sh', '-c', mkdir_p.format(usergeneratordir))
#