diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-06-22 05:43:07 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-06-22 05:43:07 +0200 |
| commit | a3723b97efba3f93dd06630e5315c4f8e626cdd7 (patch) | |
| tree | 33d6258ee02808068e0780c5aa96edf1c7791ad5 | |
| parent | 795750caa1a4bcb944d7c0731dea549e5a758d6a (diff) | |
build-sys: fix directory creation of a few dirs
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | systemd.pc.in | 7 |
2 files changed, 12 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 5a97b35744..f1bc036907 100644 --- a/Makefile.am +++ b/Makefile.am @@ -613,8 +613,8 @@ install-data-hook: $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants \ $(DESTDIR)$(pkgsysconfdir)/session \ $(DESTDIR)$(sysconfdir)/xdg/systemd - $(MKDIR_P) -m 0755 $(DESTDIR)/cgroup/systemd || \ - echo "Don't forget to create /cgroup/systemd! Couldn't create it for you, continuing anyway." + $(MKDIR_P) -m 0755 $(DESTDIR)/cgroup || \ + echo "Don't forget to create /cgroup! Couldn't create it for you, continuing anyway." ( cd $(DESTDIR)$(sysconfdir)/xdg/systemd/ && \ rm -f session && \ $(LN_S) $(pkgsysconfdir)/session session ) @@ -670,6 +670,8 @@ install-data-hook: rm -f org.freedesktop.systemd1.service && \ $(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service ) if TARGET_FEDORA + $(MKDIR_P) -m 0755 \ + $(DESTDIR)$(SYSTEM_SYSVINIT_PATH) ( cd $(DESTDIR)$(pkgsysconfdir)/system && \ rm -f display-manager.service && \ $(LN_S) $(systemunitdir)/prefdm.service display-manager.service ) @@ -682,7 +684,7 @@ if TARGET_FEDORA ( cd $(DESTDIR)$(systemunitdir) && \ rm -f 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 ) endif if TARGET_GENTOO diff --git a/systemd.pc.in b/systemd.pc.in index 3f8ed5c3e6..71a5678f8d 100644 --- a/systemd.pc.in +++ b/systemd.pc.in @@ -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@ exec_prefix=${prefix} systemdsystemunitdir=@systemunitdir@ |