build-sys: install stuff intended for / into ${rootdir} which is configurable with...

diff --git a/Makefile.am b/Makefile.am
index 96e145b31d509de2c8b65e9e398595f215fe7b21..5f880afe0045be08336c09f36474bd39b456152f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,13 +17,21 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
+# Dirs of external packages
 dbuspolicydir=$(sysconfdir)/dbus-1/system.d
 udevrulesdir=@udevrulesdir@
+interfacedir=$(datadir)/dbus-1/interfaces
 
+# Our own, non-special dirs
 pkgsysconfdir=$(sysconfdir)/systemd
-systemunitdir=$(pkgdatadir)/system
 sessionunitdir=$(pkgdatadir)/session
-interfacedir=$(datadir)/dbus-1/interfaces
+
+# And these are the special ones for /
+rootdir=@rootdir@
+rootsbindir=$(rootdir)/sbin
+rootbindir=$(rootdir)/bin
+rootlibexecdir=$(rootdir)/lib/systemd
+systemunitdir=$(rootdir)/lib/systemd/system
 
 AM_CPPFLAGS = \
         -include $(top_builddir)/config.h \
@@ -33,22 +41,22 @@ AM_CPPFLAGS = \
        -DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" \
        -DSESSION_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/session\" \
        -DSESSION_DATA_UNIT_PATH=\"$(sessionunitdir)\" \
-       -DCGROUP_AGENT_PATH=\"$(pkglibexecdir)/systemd-cgroups-agent\" \
-       -DSYSTEMD_BINARY_PATH=\"$(sbindir)/systemd\" \
+       -DCGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
+       -DSYSTEMD_BINARY_PATH=\"$(rootsbindir)/systemd\" \
        -I $(top_srcdir)/src
 
-sbin_PROGRAMS = \
+rootsbin_PROGRAMS = \
        systemd
 
-bin_PROGRAMS = \
+rootbin_PROGRAMS = \
        systemctl
 
 if HAVE_GTK
-bin_PROGRAMS += \
+bin_PROGRAMS = \
        systemadm
 endif
 
-pkglibexec_PROGRAMS = \
+rootlibexec_PROGRAMS = \
        systemd-logger \
        systemd-cgroups-agent \
        systemd-initctl
@@ -477,10 +485,10 @@ install-data-hook:
                $(LN_S) ../systemd-initctl.socket systemd-initctl.socket )
        ( cd $(DESTDIR)$(sessionunitdir) && \
                rm -f shutdown.target sockets.target local-fs.target swap.target && \
-               $(LN_S) ../system/shutdown.target shutdown.target && \
-               $(LN_S) ../system/sockets.target sockets.target && \
-               $(LN_S) ../system/local-fs.target local-fs.target && \
-               $(LN_S) ../system/swap.target swap.target )
+               $(LN_S) $(systemunitdir)/shutdown.target shutdown.target && \
+               $(LN_S) $(systemunitdir)/sockets.target sockets.target && \
+               $(LN_S) $(systemunitdir)/local-fs.target local-fs.target && \
+               $(LN_S) $(systemunitdir)/swap.target swap.target )
        ( cd $(DESTDIR)$(systemunitdir) && \
                rm -f runlevel0.target runlevel1.target runlevel6.target && \
                $(LN_S) poweroff.target runlevel0.target && \
@@ -512,14 +520,12 @@ install-data-hook:
                        dev-mqueue.automount \
                        proc-sys-fs-binfmt_misc.automount \
                        sys-kernel-debug.automount \
-                       sys-fs-fuse-connections.automount \
                        sys-kernel-security.automount && \
                $(LN_S) ../dev-hugepages.automount dev-hugepages.automount && \
                $(LN_S) ../dev-mqueue.automount dev-mqueue.automount && \
                $(LN_S) ../proc-sys-fs-binfmt_misc.automount proc-sys-fs-binfmt_misc.automount && \
                $(LN_S) ../sys-kernel-debug.automount sys-kernel-debug.automount && \
-               $(LN_S) ../sys-kernel-security.automount sys-kernel-security.automount && \
-               $(LN_S) ../sys-fs-fuse-connections.automount sys-fs-fuse-connections.automount )
+               $(LN_S) ../sys-kernel-security.automount sys-kernel-security.automount )
 if TARGET_FEDORA
        ( cd $(DESTDIR)$(pkgsysconfdir)/system && \
                rm -f display-manager.service && \
@@ -546,4 +552,5 @@ if TARGET_GENTOO
 endif
 
 DISTCHECK_CONFIGURE_FLAGS = \
-       --with-udevrulesdir=$$dc_install_base/$(udevrulesdir)
+       --with-udevrulesdir=$$dc_install_base/$(udevrulesdir) \
+       --with-rootdir=$$dc_install_base/$(rootdir)

diff --git a/configure.ac b/configure.ac
index ffdedeedff94d7e1d6c37a83be0d5060a2206290..dd3f152f9087fbcaf0c54f9080aaf27a8ee5c6ad 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -269,6 +269,12 @@ AC_ARG_WITH([udevrulesdir],
         [with_udevrulesdir=/lib/udev/rules.d])
 AC_SUBST([udevrulesdir], [$with_udevrulesdir])
 
+AC_ARG_WITH([rootdir],
+        AS_HELP_STRING([--with-rootdir=DIR], [Root directory for files necessary for boot]),
+        [],
+        [with_rootdir=/])
+AC_SUBST([rootdir], [$with_rootdir])
+
 AC_OUTPUT([Makefile])
 
 echo "
@@ -280,5 +286,7 @@ echo "
         Syslog service:          ${SPECIAL_SYSLOG_SERVICE}
         D-Bus service:           ${SPECIAL_DBUS_SERVICE}
         Gtk:                     ${have_gtk}
+        prefix:                  ${prefix}
+        root dir:                ${with_rootdir}
         udev rules dir:          ${with_udevrulesdir}
 "