From 955851f3849e3fb57541bef37e241caf5aa7692c Mon Sep 17 00:00:00 2001
From: Jason Evans <jasone@canonware.com>
Date: Thu, 31 Mar 2011 22:38:51 -0700
Subject: [PATCH] Adjust repo path dependencies.

Update .gitignore and configure.ac to deal with the recent directory
restructuring.
---
 .gitignore   | 46 +++++++++++++++++++++++-----------------------
 configure.ac |  2 +-
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/.gitignore b/.gitignore
index d6fa8fd1..32b4c424 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,23 +1,23 @@
-/jemalloc/autom4te.cache/
-/jemalloc/config.stamp
-/jemalloc/config.log
-/jemalloc/config.status
-/jemalloc/configure
-/jemalloc/doc/html.xsl
-/jemalloc/doc/manpages.xsl
-/jemalloc/doc/jemalloc.xml
-/jemalloc/doc/jemalloc.html
-/jemalloc/doc/jemalloc.3
-/jemalloc/lib/
-/jemalloc/Makefile
-/jemalloc/include/jemalloc/internal/jemalloc_internal\.h
-/jemalloc/include/jemalloc/jemalloc\.h
-/jemalloc/include/jemalloc/jemalloc_defs\.h
-/jemalloc/test/jemalloc_test\.h
-/jemalloc/src/*.[od]
-/jemalloc/test/*.[od]
-/jemalloc/test/*.out
-/jemalloc/test/[a-z]*
-!/jemalloc/test/*.c
-!/jemalloc/test/*.exp
-/jemalloc/VERSION
+/autom4te.cache/
+/config.stamp
+/config.log
+/config.status
+/configure
+/doc/html.xsl
+/doc/manpages.xsl
+/doc/jemalloc.xml
+/doc/jemalloc.html
+/doc/jemalloc.3
+/lib/
+/Makefile
+/include/jemalloc/internal/jemalloc_internal\.h
+/include/jemalloc/jemalloc\.h
+/include/jemalloc/jemalloc_defs\.h
+/test/jemalloc_test\.h
+/src/*.[od]
+/test/*.[od]
+/test/*.out
+/test/[a-z]*
+!test/*.c
+!test/*.exp
+/VERSION
diff --git a/configure.ac b/configure.ac
index 412d3d1b..e317d0a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -688,7 +688,7 @@ dnl jemalloc configuration.
 dnl 
 
 dnl Set VERSION if source directory has an embedded git repository.
-if test -d "${srcroot}../.git" ; then
+if test -d "${srcroot}.git" ; then
   git describe --long --abbrev=40 > ${srcroot}VERSION
 fi
 jemalloc_version=`cat ${srcroot}VERSION`