build-sys: fix directory creation of a few dirs

This commit is contained in:
Lennart Poettering 2010-06-22 05:43:07 +02:00
parent 795750caa1
commit a3723b97ef
2 changed files with 12 additions and 3 deletions

View File

@ -613,8 +613,8 @@ install-data-hook:
$(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants \ $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants \
$(DESTDIR)$(pkgsysconfdir)/session \ $(DESTDIR)$(pkgsysconfdir)/session \
$(DESTDIR)$(sysconfdir)/xdg/systemd $(DESTDIR)$(sysconfdir)/xdg/systemd
$(MKDIR_P) -m 0755 $(DESTDIR)/cgroup/systemd || \ $(MKDIR_P) -m 0755 $(DESTDIR)/cgroup || \
echo "Don't forget to create /cgroup/systemd! Couldn't create it for you, continuing anyway." echo "Don't forget to create /cgroup! Couldn't create it for you, continuing anyway."
( cd $(DESTDIR)$(sysconfdir)/xdg/systemd/ && \ ( cd $(DESTDIR)$(sysconfdir)/xdg/systemd/ && \
rm -f session && \ rm -f session && \
$(LN_S) $(pkgsysconfdir)/session session ) $(LN_S) $(pkgsysconfdir)/session session )
@ -670,6 +670,8 @@ install-data-hook:
rm -f org.freedesktop.systemd1.service && \ rm -f org.freedesktop.systemd1.service && \
$(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service ) $(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service )
if TARGET_FEDORA if TARGET_FEDORA
$(MKDIR_P) -m 0755 \
$(DESTDIR)$(SYSTEM_SYSVINIT_PATH)
( cd $(DESTDIR)$(pkgsysconfdir)/system && \ ( cd $(DESTDIR)$(pkgsysconfdir)/system && \
rm -f display-manager.service && \ rm -f display-manager.service && \
$(LN_S) $(systemunitdir)/prefdm.service display-manager.service ) $(LN_S) $(systemunitdir)/prefdm.service display-manager.service )
@ -682,7 +684,7 @@ if TARGET_FEDORA
( cd $(DESTDIR)$(systemunitdir) && \ ( cd $(DESTDIR)$(systemunitdir) && \
rm -f local.service && \ rm -f local.service && \
$(LN_S) rc-local.service local.service ) $(LN_S) rc-local.service local.service )
( cd $(DESTDIR)/etc/init.d && \ ( cd $(DESTDIR)$(SYSTEM_SYSVINIT_PATH) && \
$(LN_S) halt reboot > /dev/null 2>&1 || true ) $(LN_S) halt reboot > /dev/null 2>&1 || true )
endif endif
if TARGET_GENTOO if TARGET_GENTOO

View File

@ -1,3 +1,10 @@
# This file is part of systemd.
#
# systemd is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
prefix=@prefix@ prefix=@prefix@
exec_prefix=${prefix} exec_prefix=${prefix}
systemdsystemunitdir=@systemunitdir@ systemdsystemunitdir=@systemunitdir@