summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xautogen.sh2
-rw-r--r--configure.ac7
2 files changed, 8 insertions, 1 deletions
diff --git a/autogen.sh b/autogen.sh
index 3027f83153..2d4acdfef1 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -47,7 +47,7 @@ fi
if [ ! -L /bin ]; then
args="$args \
---with-rootprefix= \
+--with-rootprefix=/ \
--with-rootlibdir=$(libdir /lib) \
"
fi
diff --git a/configure.ac b/configure.ac
index ea29ab475a..62df8484b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1387,6 +1387,13 @@ AX_NORMALIZE_PATH([with_zshcompletiondir])
AC_ARG_WITH([rootprefix],
AS_HELP_STRING([--with-rootprefix=DIR], [rootfs directory prefix for config files and kernel modules]),
[], [with_rootprefix=${ac_default_prefix}])
+# --with-rootprefix= (empty) should default to "/" but AX_NORMALIZE_PATH
+# defaults those to ".", solve that here for now until we can find a suitable
+# fix for AX_NORMALIZE_PATH upstream at autoconf-archive.
+# See: https://github.com/systemd/systemd/issues/54
+if test "x${with_rootprefix}" = "x"; then
+ with_rootprefix="/"
+fi
AX_NORMALIZE_PATH([with_rootprefix])
AC_ARG_WITH([rootlibdir],