From: Dan Gohman Date: Tue, 24 Mar 2009 23:46:25 +0000 (+0000) Subject: Fix paths; AutoRegen.sh changes its current working directory to be the X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=497e863c7415aee5c7035c2fd5c83d2f0b7ccfdb;p=oota-llvm.git Fix paths; AutoRegen.sh changes its current working directory to be the autoconf directory, but these paths need to be relative to the main source directory. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@67655 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/projects/sample/autoconf/AutoRegen.sh b/projects/sample/autoconf/AutoRegen.sh index 126703ba5aa..6e6931c7a9b 100755 --- a/projects/sample/autoconf/AutoRegen.sh +++ b/projects/sample/autoconf/AutoRegen.sh @@ -13,14 +13,14 @@ cwd=`pwd` if test -d ../../../autoconf/m4 ; then cd ../../../autoconf/m4 llvm_m4=`pwd` - llvm_src_root=../../.. - llvm_obj_root=../../.. + llvm_src_root=../.. + llvm_obj_root=../.. cd $cwd elif test -d ../../llvm/autoconf/m4 ; then cd ../../llvm/autoconf/m4 llvm_m4=`pwd` - llvm_src_root=../.. - llvm_obj_root=../.. + llvm_src_root=.. + llvm_obj_root=.. cd $cwd else while true ; do diff --git a/projects/sample/autoconf/configure.ac b/projects/sample/autoconf/configure.ac index 37c93a8f515..0764806ea98 100644 --- a/projects/sample/autoconf/configure.ac +++ b/projects/sample/autoconf/configure.ac @@ -4,8 +4,8 @@ dnl ************************************************************************** AC_INIT([[[SAMPLE]]],[[[x.xx]]],[bugs@yourdomain]) dnl Identify where LLVM source tree is -LLVM_SRC_ROOT="../../" -LLVM_OBJ_ROOT="../../" +LLVM_SRC_ROOT="../.." +LLVM_OBJ_ROOT="../.." dnl Tell autoconf that the auxilliary files are actually located in dnl the LLVM autoconf directory, not here. AC_CONFIG_AUX_DIR($LLVM_SRC_ROOT/autoconf)