llvm-config.patch

   1 --- llvm-3.1.src/tools/llvm-config/llvm-config.cpp.orig 2012-05-16 00:06:08.000000000 +0200
   2 +++ llvm-3.1.src/tools/llvm-config/llvm-config.cpp      2012-10-12 17:44:41.041037043 +0200
   3 @@ -234,11 +234,11 @@
   4        break;
   5      case CMakeStyle:
   6        ActiveBinDir = ActiveObjRoot + "/bin";
   7 -      ActiveLibDir = ActiveObjRoot + "/lib";
   8 +      ActiveLibDir = LLVM_LIBDIR;
   9        break;
  10      case CMakeBuildModeStyle:
  11        ActiveBinDir = ActiveObjRoot + "/bin/" + LLVM_BUILDMODE;
  12 -      ActiveLibDir = ActiveObjRoot + "/lib/" + LLVM_BUILDMODE;
  13 +      ActiveLibDir = LLVM_LIBDIR "/" LLVM_BUILDMODE;
  14        break;
  15      }
  16
  17 @@ -249,7 +249,7 @@
  18      ActivePrefix = CurrentExecPrefix;
  19      ActiveIncludeDir = ActivePrefix + "/include";
  20      ActiveBinDir = ActivePrefix + "/bin";
  21 -    ActiveLibDir = ActivePrefix + "/lib";
  22 +    ActiveLibDir = LLVM_LIBDIR;
  23      ActiveIncludeOption = "-I" + ActiveIncludeDir;
  24    }
  25
  26 --- llvm-3.1.src/autoconf/configure.ac.orig     2012-05-11 22:48:57.000000000 +0200
  27 +++ llvm-3.1.src/autoconf/configure.ac  2012-10-12 17:39:00.668599306 +0200
  28 @@ -1472,13 +1472,13 @@
  29  fi
  30  eval LLVM_PREFIX="${prefix}";
  31  eval LLVM_BINDIR="${prefix}/bin";
  32 -eval LLVM_LIBDIR="${prefix}/lib";
  33 +eval LLVM_LIBDIR="${libdir}";
  34  eval LLVM_DATADIR="${prefix}/share/llvm";
  35  eval LLVM_DOCSDIR="${prefix}/share/doc/llvm";
  36  eval LLVM_ETCDIR="${prefix}/etc/llvm";
  37  eval LLVM_INCLUDEDIR="${prefix}/include";
  38 -eval LLVM_INFODIR="${prefix}/info";
  39 -eval LLVM_MANDIR="${prefix}/man";
  40 +eval LLVM_INFODIR="${datadir}/info";
  41 +eval LLVM_MANDIR="${datadir}/man";
  42  LLVM_CONFIGTIME=`date`
  43  AC_SUBST(LLVM_PREFIX)
  44  AC_SUBST(LLVM_BINDIR)