Make sure to default ${prefix} to /usr/local if the user didn't specify it.

This assists with getting around configure's late binding values so that
our LLVM variables don't end up with a "NONE" prefix.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@28325 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index b29ce31f964db366a5b98d2adca6d6f2fc01392a..f6bb7a5445ee9458458b1a8b4d738102e58da7a3 100644 (file)
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
@@ -632,6 +632,9 @@ AC_SUBST(SHLIBEXT,$libltdl_cv_shlibext)
 # Translate the various configuration directories and other basic
 # information into substitutions that will end up in Makefile.config.in 
 # that these configured values can be used by the makefiles
+if test "${prefix}" == "NONE" ; then
+  prefix="/usr/local"
+fi
 eval LLVM_PREFIX="${prefix}";
 eval LLVM_BINDIR="${prefix}/bin";
 eval LLVM_LIBDIR="${prefix}/lib";

diff --git a/configure b/configure
index b235fcd95c07ec2a6448ded6c4f27e0897af5080..9b0e36e973f73b5a904cb147c8c2ef2b686468cd 100755 (executable)
--- a/configure
+++ b/configure
@@ -30739,6 +30739,9 @@ SHLIBEXT=$libltdl_cv_shlibext
 # Translate the various configuration directories and other basic
 # information into substitutions that will end up in Makefile.config.in
 # that these configured values can be used by the makefiles
+if test "${prefix}" == "NONE" ; then
+  prefix="/usr/local"
+fi
 eval LLVM_PREFIX="${prefix}";
 eval LLVM_BINDIR="${prefix}/bin";
 eval LLVM_LIBDIR="${prefix}/lib";