From: Christoph Hellwig <hch@lst.de>
Date: Thu, 22 Jul 2010 05:18:33 +0000 (+0200)
Subject: fix configure --prefix
X-Git-Tag: v3.1.3~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2ccb8cf0927df9ca8a2e018ff453d18693a30b38;p=thirdparty%2Fxfsprogs-dev.git

fix configure --prefix

We need to substitute root_sbindir and root_libdir even for the case
where we don't have the different from the default prefix, otherwise
xfsprogs won't build for that case with rpath errors, and wouldn't
install correctly either.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Alex Elder <aelder@sgi.com>
Reported-by: Christian Kujau <lists@nerdbynature.de>
Tested-by: Christian Kujau <lists@nerdbynature.de>
---

diff --git a/configure.in b/configure.in
index dc811e2bf..30907deac 100644
--- a/configure.in
+++ b/configure.in
@@ -65,12 +65,17 @@ esac
 case $exec_prefix:$prefix in
 NONE:NONE | NONE:/usr | /usr:*)
   root_sbindir='/sbin'
-  AC_SUBST([root_sbindir])
-
   root_libdir="/${base_libdir}"
-  AC_SUBST([root_libdir])
+  ;;
+*)
+  root_sbindir="${sbindir}"
+  root_libdir="${libdir}"
+  ;;
 esac
 
+AC_SUBST([root_sbindir])
+AC_SUBST([root_libdir])
+
 # Find localized files
 LOCALIZED_FILES=""
 for lfile in `find ${srcdir} -name '*.c' -type f || exit 1`; do