summaryrefslogtreecommitdiff
path: root/projects
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2013-06-11 18:52:11 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2013-06-11 18:52:11 +0000
commitadd4c2fbb1c5038337146a04e48d66a3d8bafa6b (patch)
tree48247d82257bab54c89b439034b1c28716198767 /projects
parent4cef3d818183aafc1b3adfad4140483d9ad1ad86 (diff)
downloadllvm-add4c2fbb1c5038337146a04e48d66a3d8bafa6b.tar.gz
llvm-add4c2fbb1c5038337146a04e48d66a3d8bafa6b.tar.bz2
llvm-add4c2fbb1c5038337146a04e48d66a3d8bafa6b.tar.xz
Don't define LLVM_LIBDIR, it is not used anymore.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@183769 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'projects')
-rw-r--r--projects/sample/autoconf/configure.ac6
-rwxr-xr-xprojects/sample/configure15
2 files changed, 4 insertions, 17 deletions
diff --git a/projects/sample/autoconf/configure.ac b/projects/sample/autoconf/configure.ac
index 02d9aa88a7..fdc44bf932 100644
--- a/projects/sample/autoconf/configure.ac
+++ b/projects/sample/autoconf/configure.ac
@@ -1365,7 +1365,6 @@ if test "${prefix}" = "NONE" ; then
fi
eval LLVM_PREFIX="${prefix}";
eval LLVM_BINDIR="${prefix}/bin";
-eval LLVM_LIBDIR="${prefix}/lib";
eval LLVM_DATADIR="${prefix}/share/llvm";
eval LLVM_DOCSDIR="${prefix}/share/doc/llvm";
eval LLVM_ETCDIR="${prefix}/etc/llvm";
@@ -1375,7 +1374,6 @@ eval LLVM_MANDIR="${prefix}/man";
LLVM_CONFIGTIME=`date`
AC_SUBST(LLVM_PREFIX)
AC_SUBST(LLVM_BINDIR)
-AC_SUBST(LLVM_LIBDIR)
AC_SUBST(LLVM_DATADIR)
AC_SUBST(LLVM_DOCSDIR)
AC_SUBST(LLVM_ETCDIR)
@@ -1390,8 +1388,6 @@ AC_DEFINE_UNQUOTED(LLVM_PREFIX,"$LLVM_PREFIX",
[Installation prefix directory])
AC_DEFINE_UNQUOTED(LLVM_BINDIR, "$LLVM_BINDIR",
[Installation directory for binary executables])
-AC_DEFINE_UNQUOTED(LLVM_LIBDIR, "$LLVM_LIBDIR",
- [Installation directory for libraries])
AC_DEFINE_UNQUOTED(LLVM_DATADIR, "$LLVM_DATADIR",
[Installation directory for data files])
AC_DEFINE_UNQUOTED(LLVM_DOCSDIR, "$LLVM_DOCSDIR",
@@ -1449,7 +1445,7 @@ for a_binding in $BINDINGS_TO_BUILD ; do
AC_SUBST(OCAML_LIBDIR,$ocaml_stdlib)
else
# ocaml stdlib is outside our prefix; use libdir/ocaml
- AC_SUBST(OCAML_LIBDIR,$LLVM_LIBDIR/ocaml)
+ AC_SUBST(OCAML_LIBDIR,${prefix}/lib/ocaml)
fi
fi
;;
diff --git a/projects/sample/configure b/projects/sample/configure
index f8b52b7af2..d41ba3dbae 100755
--- a/projects/sample/configure
+++ b/projects/sample/configure
@@ -772,7 +772,6 @@ SHLIBEXT
SHLIBPATH_VAR
LLVM_PREFIX
LLVM_BINDIR
-LLVM_LIBDIR
LLVM_DATADIR
LLVM_DOCSDIR
LLVM_ETCDIR
@@ -10363,7 +10362,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10366 "configure"
+#line 10365 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -20702,7 +20701,6 @@ if test "${prefix}" = "NONE" ; then
fi
eval LLVM_PREFIX="${prefix}";
eval LLVM_BINDIR="${prefix}/bin";
-eval LLVM_LIBDIR="${prefix}/lib";
eval LLVM_DATADIR="${prefix}/share/llvm";
eval LLVM_DOCSDIR="${prefix}/share/doc/llvm";
eval LLVM_ETCDIR="${prefix}/etc/llvm";
@@ -20720,7 +20718,6 @@ LLVM_CONFIGTIME=`date`
-
# Place the various directores into the config.h file as #defines so that we
# can know about the installation paths within LLVM.
@@ -20735,11 +20732,6 @@ _ACEOF
cat >>confdefs.h <<_ACEOF
-#define LLVM_LIBDIR "$LLVM_LIBDIR"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
#define LLVM_DATADIR "$LLVM_DATADIR"
_ACEOF
@@ -20825,7 +20817,7 @@ echo "$as_me: WARNING: --enable-bindings=ocaml specified, but ocamlopt not found
else
# ocaml stdlib is outside our prefix; use libdir/ocaml
- OCAML_LIBDIR=$LLVM_LIBDIR/ocaml
+ OCAML_LIBDIR=${prefix}/lib/ocaml
fi
fi
@@ -21826,7 +21818,6 @@ SHLIBEXT!$SHLIBEXT$ac_delim
SHLIBPATH_VAR!$SHLIBPATH_VAR$ac_delim
LLVM_PREFIX!$LLVM_PREFIX$ac_delim
LLVM_BINDIR!$LLVM_BINDIR$ac_delim
-LLVM_LIBDIR!$LLVM_LIBDIR$ac_delim
LLVM_DATADIR!$LLVM_DATADIR$ac_delim
LLVM_DOCSDIR!$LLVM_DOCSDIR$ac_delim
LLVM_ETCDIR!$LLVM_ETCDIR$ac_delim
@@ -21844,7 +21835,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 91; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 90; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5