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.
This commit is contained in:
Ian Stakenvicius 2013-04-04 12:50:17 -04:00
parent c4657beb83
commit 1d70a98af4
1 changed files with 3 additions and 3 deletions

View File

@ -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])