summaryrefslogtreecommitdiffstats
path: root/llvm/projects/sample
diff options
context:
space:
mode:
authorDan Gohman <gohman@apple.com>2009-03-24 23:46:25 +0000
committerDan Gohman <gohman@apple.com>2009-03-24 23:46:25 +0000
commit34be8be297fd3c46a970235edac021c1fe209744 (patch)
treea012ca2b74e9b17e278f3c8b3701a7939a32dd03 /llvm/projects/sample
parentafcd6a3133e2c5daccc999958fd102a875e082b1 (diff)
downloadbcm5719-llvm-34be8be297fd3c46a970235edac021c1fe209744.tar.gz
bcm5719-llvm-34be8be297fd3c46a970235edac021c1fe209744.zip
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. llvm-svn: 67655
Diffstat (limited to 'llvm/projects/sample')
-rwxr-xr-xllvm/projects/sample/autoconf/AutoRegen.sh8
-rw-r--r--llvm/projects/sample/autoconf/configure.ac4
2 files changed, 6 insertions, 6 deletions
diff --git a/llvm/projects/sample/autoconf/AutoRegen.sh b/llvm/projects/sample/autoconf/AutoRegen.sh
index 126703ba5aa..6e6931c7a9b 100755
--- a/llvm/projects/sample/autoconf/AutoRegen.sh
+++ b/llvm/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/llvm/projects/sample/autoconf/configure.ac b/llvm/projects/sample/autoconf/configure.ac
index 37c93a8f515..0764806ea98 100644
--- a/llvm/projects/sample/autoconf/configure.ac
+++ b/llvm/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)
OpenPOWER on IntegriCloud