diff options
| author | Daniel Mack <github@zonque.org> | 2015-06-03 18:01:21 +0200 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2015-06-03 18:01:21 +0200 |
| commit | 75db28c8f2a874d74579eb08ebce78fa0290277c (patch) | |
| tree | eece45d41a0dad4a2ead4897c76a5c0b96b65b86 | |
| parent | 2b4919a68cf826efbe939291e6dc4f08e824dc41 (diff) | |
| parent | e013d21b6218011c99dbbcd4c61fc73a24490a94 (diff) | |
Merge pull request #55 from filbranden/rootprefix_empty1
Fix --with-rootprefix= (empty) with a workaround for now.
| -rwxr-xr-x | autogen.sh | 2 | ||||
| -rw-r--r-- | configure.ac | 7 |
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], |