diff options
| -rw-r--r-- | Makefile.am | 11 | ||||
| -rwxr-xr-x | autogen.sh | 2 | ||||
| -rw-r--r-- | configure.ac | 11 |
3 files changed, 12 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am index 09df759d0e..21d833a4fc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -56,12 +56,12 @@ usergeneratordir=$(pkglibexecdir)/user-generators pkgincludedir=$(includedir)/systemd # And these are the special ones for / -rootdir=@rootdir@ -rootbindir=$(rootdir)/bin -rootlibexecdir=$(rootdir)/lib/systemd +rootprefix=@rootprefix@ +rootbindir=$(rootprefix)/bin +rootlibexecdir=$(rootprefix)/lib/systemd systemgeneratordir=$(rootlibexecdir)/system-generators systemshutdowndir=$(rootlibexecdir)/system-shutdown -systemunitdir=$(rootdir)/lib/systemd/system +systemunitdir=$(rootprefix)/lib/systemd/system CLEANFILES = EXTRA_DIST = @@ -89,6 +89,7 @@ AM_CPPFLAGS = \ -DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \ -DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" \ -DSYSTEMD_STDIO_BRIDGE_BINARY_PATH=\"$(bindir)/systemd-stdio-bridge\" \ + -DROOTPREFIX=\"$(rootprefix)\" \ -DRUNTIME_DIR=\"/run\" \ -DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \ -DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \ @@ -2396,7 +2397,7 @@ DISTCHECK_CONFIGURE_FLAGS = \ --with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \ --with-udevrulesdir=$$dc_install_base/$(udevrulesdir) \ --with-pamlibdir=$$dc_install_base/$(pamlibdir) \ - --with-rootdir=$$dc_install_base/$(rootdir) + --with-rootprefix=$$dc_install_base/$(rootprefix) upload: all distcheck cp -v systemd-$(VERSION).tar.bz2 /home/lennart/git.fedora/systemd/ diff --git a/autogen.sh b/autogen.sh index b2b680a85c..4c834b6d61 100755 --- a/autogen.sh +++ b/autogen.sh @@ -76,7 +76,7 @@ else --localstatedir=/var \ --libexecdir=/usr/lib \ --libdir=$(libdir /usr/local/lib) \ - --with-rootdir= \ + --with-rootprefix= \ "$@" make clean fi diff --git a/configure.ac b/configure.ac index 0316ad1246..a78febbbc0 100644 --- a/configure.ac +++ b/configure.ac @@ -602,10 +602,9 @@ AC_ARG_WITH([pamlibdir], [], [with_pamlibdir=/lib/`$CC -print-multi-os-directory`/security]) -AC_ARG_WITH([rootdir], - AS_HELP_STRING([--with-rootdir=DIR], [Root directory for files necessary for boot]), - [], - [with_rootdir=${ac_default_prefix}]) +AC_ARG_WITH([rootprefix], + AS_HELP_STRING([--with-rootprefix=DIR], [rootfs directory prefix for config files and kernel modules]), + [], [with_rootprefix=${ac_default_prefix}]) AC_ARG_WITH([rootlibdir], AS_HELP_STRING([--with-rootlibdir=DIR], [Root directory for libraries necessary for boot]), @@ -618,7 +617,7 @@ AC_SUBST([dbussystemservicedir], [$with_dbussystemservicedir]) AC_SUBST([dbusinterfacedir], [$with_dbusinterfacedir]) AC_SUBST([udevrulesdir], [$with_udevrulesdir]) AC_SUBST([pamlibdir], [$with_pamlibdir]) -AC_SUBST([rootdir], [$with_rootdir]) +AC_SUBST([rootprefix], [$with_rootprefix]) AC_SUBST([rootlibdir], [$with_rootlibdir]) AC_CONFIG_FILES([Makefile po/Makefile.in]) @@ -649,7 +648,7 @@ AC_MSG_RESULT([ localed: ${have_localed} plymouth: ${have_plymouth} prefix: ${prefix} - root dir: ${with_rootdir} + rootprefix: ${with_rootprefix} lib dir: ${libdir} rootlib dir: ${with_rootlibdir} pam modules dir: ${with_pamlibdir} |