aboutsummaryrefslogtreecommitdiffstats
path: root/projects
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
commit497e863c7415aee5c7035c2fd5c83d2f0b7ccfdb (patch)
treea9964cbbcc697e40958d1e181f3b6132649f86aa /projects
parentc9ebae3389f79f857798ddc888b12f349f7f9e82 (diff)
downloadexternal_llvm-497e863c7415aee5c7035c2fd5c83d2f0b7ccfdb.zip
external_llvm-497e863c7415aee5c7035c2fd5c83d2f0b7ccfdb.tar.gz
external_llvm-497e863c7415aee5c7035c2fd5c83d2f0b7ccfdb.tar.bz2
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
Diffstat (limited to 'projects')
-rwxr-xr-xprojects/sample/autoconf/AutoRegen.sh8
-rw-r--r--projects/sample/autoconf/configure.ac4
2 files changed, 6 insertions, 6 deletions
diff --git a/projects/sample/autoconf/AutoRegen.sh b/projects/sample/autoconf/AutoRegen.sh
index 126703b..6e6931c 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 37c93a8..0764806 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)