X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=autogen.sh;h=3d04d84afe55b1e246fbae27842e8e4b5c36e5e6;hp=b0706b4274ca0eb28039a1d75e647e1ff6381dba;hb=dc2bcafd2a0be8e9ba79aede6b1bfbb9cd00dc94;hpb=7e773a89d8bea8bd2a1680406bb3bd39d8050dbc;ds=sidebyside

diff --git a/autogen.sh b/autogen.sh
index b0706b4..3d04d84 100644
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,11 +4,13 @@
 
 # install Lustre Git commit hooks by default - LU-2083
 for HOOK in commit-msg prepare-commit-msg; do
-	[ -e .git/hooks/$HOOK ] || ln -sf ../build/$HOOK .git/hooks/
+	if [ -d .git/hooks -a ! -e .git/hooks/$HOOK ]; then
+		ln -sf ../../build/$HOOK .git/hooks/
+	fi
 done
 
 echo "Checking for a complete tree..."
-REQUIRED_DIRS="build libcfs lnet lustre"
+REQUIRED_DIRS="libcfs lnet lustre"
 OPTIONAL_DIRS="snmp portals"
 CONFIGURE_DIRS="libsysio lustre-iokit ldiskfs"
 
@@ -43,7 +45,7 @@ run_cmd()
 	echo
 }
 
-run_cmd "aclocal $ACLOCAL_FLAGS"
+run_cmd "aclocal -I $PWD/config $ACLOCAL_FLAGS"
 run_cmd "autoheader"
 run_cmd "automake -a -c"
 run_cmd autoconf