diff options
| author | Ian Stakenvicius <axs@gentoo.org> | 2013-04-04 12:50:17 -0400 |
|---|---|---|
| committer | Ian Stakenvicius <axs@gentoo.org> | 2013-04-04 12:59:24 -0400 |
| commit | 1d70a98af49337f52ba5f8f0f855cad09959fc47 (patch) | |
| tree | 9cdd40ae2bc67f365d84147e17bd333af1b07c6c | |
| parent | c4657beb83567a3e3fca83d0ad8d0a7584c6b763 (diff) | |
Set rootprefix to be '${prefix}' if unset
Previously, rootprefix was set to the actual value of the default prefix,
which caused issues when running 'make distcheck' since prefix is set
to a non-standard value but rootprefix is unset. By assigning the variable
rather than its contents, this should now be avoided.
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 0549d43a5c..e47751aac0 100644 --- a/configure.ac +++ b/configure.ac @@ -94,7 +94,7 @@ AC_ARG_WITH( [--with-rootprefix=DIR], [rootfs directory prefix for config files and kernel modules])], [], - [with_rootprefix=${ac_default_prefix}] + [with_rootprefix="\${prefix}"] ) AC_ARG_WITH( @@ -113,7 +113,7 @@ AC_ARG_ENABLE( [Include hard-coded default search paths in / and /usr])], [], [AS_IF( - [test "x${ac_default_prefix}" != "x${with_rootprefix}"], + [test "x${ac_default_prefix}" != "x${with_rootprefix}" && test "x${with_rootprefix}" != "x\${prefix}"], [enable_split_usr=yes], [enable_split_usr=no])] ) @@ -126,7 +126,7 @@ AS_IF( # Configured paths AC_SUBST([rootprefix], [$with_rootprefix]) AC_SUBST([rootlibdir], [$with_rootlibdir]) -AC_SUBST([udevlibexecdir], [${with_rootprefix}/lib/udev]) +AC_SUBST([udevlibexecdir], [${rootprefix}/lib/udev]) # sysconfdir paths AC_SUBST([udevconfdir],[${sysconfdir}/udev]) |