From c4ef11c5076f1441a208d1020286c95d0ff19d2c Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Fri, 4 Jan 2008 16:55:37 -0500 Subject: [PATCH] If --sbindir, et. al are specified to configure set $root_sbindir, et al. If the user specifies as arguments to configure --bindir, --sbindir, --libdir, or --sysconfdir, then set corresponding $root_FOO variable, so that the request from the user to set a specific --sbindir is honored. Addresses-Sourceforge-Bug: 498381 Signed-off-by: "Theodore Ts'o" --- configure | 16 ++++++++++++++++ configure.in | 16 ++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/configure b/configure index 074aae13..4ab9e943 100755 --- a/configure +++ b/configure @@ -15191,6 +15191,22 @@ else root_libdir='${root_prefix}/lib' root_sysconfdir='${root_prefix}/etc' fi +if test "$bindir" != '${exec_prefix}/bin'; then + root_bindir=$bindir + echo "Setting root_bindir to $root_bindir" +fi +if test "$sbindir" != '${exec_prefix}/sbin'; then + root_sbindir=$sbindir + echo "Setting root_sbindir to $root_sbindir" +fi +if test "$libdir" != '${exec_prefix}/lib'; then + root_libdir=$libdir + echo "Setting root_libdir to $root_libdir" +fi +if test "$sysconfdir" != '${prefix}/etc'; then + root_sysconfdir=$sysconfdir + echo "Setting root_sysconfdir to $root_sysconfdir" +fi diff --git a/configure.in b/configure.in index 19cea964..12baa6b0 100644 --- a/configure.in +++ b/configure.in @@ -853,6 +853,22 @@ else root_libdir='${root_prefix}/lib' root_sysconfdir='${root_prefix}/etc' fi +if test "$bindir" != '${exec_prefix}/bin'; then + root_bindir=$bindir + echo "Setting root_bindir to $root_bindir" +fi +if test "$sbindir" != '${exec_prefix}/sbin'; then + root_sbindir=$sbindir + echo "Setting root_sbindir to $root_sbindir" +fi +if test "$libdir" != '${exec_prefix}/lib'; then + root_libdir=$libdir + echo "Setting root_libdir to $root_libdir" +fi +if test "$sysconfdir" != '${prefix}/etc'; then + root_sysconfdir=$sysconfdir + echo "Setting root_sysconfdir to $root_sysconfdir" +fi AC_SUBST(root_prefix) AC_SUBST(root_bindir) AC_SUBST(root_sbindir)