* Revert the setup hook changes on the trunk (but they remain on the

stdenv-updates branch). svn path=/nixpkgs/trunk/; revision=9652
2007-11-12 13:51:46 +00:00
parent 93ce7c7a69
commit 7a424b47f6
11 changed files with 42 additions and 30 deletions
@@ -1,5 +1,7 @@
 addAclocals () {
-	addToSearchPathWithCustomDelimiter : ACLOCAL_PATH /share/aclocal "" $1
+    if test -d $1/share/aclocal; then
+        export ACLOCAL_PATH="$ACLOCAL_PATH${ACLOCAL_PATH:+:}$1/share/aclocal"
+    fi
 }

 envHooks=(${envHooks[@]} addAclocals)