diff options
Diffstat (limited to 'src/systemd-dbus1-generator')
-rw-r--r-- | src/systemd-dbus1-generator/Makefile | 3 | ||||
-rw-r--r-- | src/systemd-dbus1-generator/dbus1-generator.c | 20 |
2 files changed, 13 insertions, 10 deletions
diff --git a/src/systemd-dbus1-generator/Makefile b/src/systemd-dbus1-generator/Makefile index 1d7f0d1a81..a817b954e5 100644 --- a/src/systemd-dbus1-generator/Makefile +++ b/src/systemd-dbus1-generator/Makefile @@ -46,4 +46,7 @@ dist_xinitrc_SCRIPTS = \ INSTALL_EXEC_HOOKS += dbus1-generator-install-hook UNINSTALL_EXEC_HOOKS += dbus1-generator-uninstall-hook +systemd.CPPFLAGS += -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" +systemd.CPPFLAGS += -DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" + include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/systemd-dbus1-generator/dbus1-generator.c b/src/systemd-dbus1-generator/dbus1-generator.c index 717cb9558e..6d71dc0c7c 100644 --- a/src/systemd-dbus1-generator/dbus1-generator.c +++ b/src/systemd-dbus1-generator/dbus1-generator.c @@ -17,18 +17,18 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "alloc-util.h" -#include "bus-internal.h" +#include "basic/alloc-util.h" +#include "sd-bus/bus-internal.h" #include "bus-util.h" -#include "cgroup-util.h" +#include "basic/cgroup-util.h" #include "conf-parser.h" -#include "dirent-util.h" -#include "fd-util.h" -#include "fileio.h" -#include "mkdir.h" -#include "special.h" -#include "unit-name.h" -#include "util.h" +#include "basic/dirent-util.h" +#include "basic/fd-util.h" +#include "basic/fileio.h" +#include "basic/mkdir.h" +#include "basic/special.h" +#include "basic/unit-name.h" +#include "basic/util.h" static const char *arg_dest_late = "/tmp", *arg_dest = "/tmp"; |