public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Always set the prefix.

Browse Source 
svn path=/nixpkgs/trunk/; revision=7513
This commit is contained in:
Eelco Dolstra 2006-12-28 21:12:44 +00:00
parent 98e5779a9b
commit 1d4d77179c
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/stdenv/generic/setup.sh
View File

@ -161,6 +161,18 @@ fi
export TZ=UTC export TZ=UTC
# Set the prefix. This is generally $out, but it can be overriden,
# for instance if we just want to perform a test build/install to a
# temporary location and write a build report to $out.
if test -z "$prefix"; then
prefix="$out";
fi
if test "$useTempPrefix" = "1"; then
prefix="$NIX_BUILD_TOP/tmp_prefix";
fi
# Execute the post-hook. # Execute the post-hook.
if test -n "@postHook@"; then if test -n "@postHook@"; then
source @postHook@ source @postHook@
@ -521,14 +533,6 @@ configureW() {
eval "$preConfigure" eval "$preConfigure"
if test -z "$prefix"; then
prefix="$out";
fi
if test "$useTempPrefix" = "1"; then
prefix="$NIX_BUILD_TOP/tmp_prefix";
fi
if test -z "$configureScript"; then if test -z "$configureScript"; then
configureScript=./configure configureScript=./configure
if ! test -x $configureScript; then if ! test -x $configureScript; then