Author: amiddelk
Date: Thu Feb 23 23:50:56 2012
New Revision: 32530
URL: https://nixos.org/websvn/nix/?rev=32530&sc=1

Log:
Fixed autoconfPhase so that it additionally tests if ./bootstrap is a file (and 
not a directory with executable permission) before executing it.

Modified:
   nixpkgs/trunk/pkgs/build-support/release/source-tarball.nix

Modified: nixpkgs/trunk/pkgs/build-support/release/source-tarball.nix
==============================================================================
--- nixpkgs/trunk/pkgs/build-support/release/source-tarball.nix Thu Feb 23 
23:47:26 2012        (r32529)
+++ nixpkgs/trunk/pkgs/build-support/release/source-tarball.nix Thu Feb 23 
23:50:56 2012        (r32530)
@@ -54,7 +54,7 @@
 
       eval "$preAutoconf"
 
-      if test -x ./bootstrap; then ./bootstrap
+      if test -x ./bootstrap && test -f ./bootstrap; then ./bootstrap
       elif test -x ./bootstrap.sh; then ./bootstrap.sh
       elif test -x ./autogen.sh; then ./autogen.sh
       elif test -x ./autogen ; then ./autogen
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to