about summary refs log tree commit diff
path: root/tests/init.sh
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2008-11-20T14·14+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2008-11-20T14·14+0000
commit285d26374aac69d2bbd1df31bc76686ad39171a4 (patch)
treed5a89a857e4079cf68e0a750dc8b630776fd37e4 /tests/init.sh
parenta55113411fe8e6ef39e24c79564e39f07f5a8fdf (diff)
* Don't set the prefix to /nix by default, rather use the Autoconf
  default of /usr/local.  However, localstatedir and storedir are set
  to /nix/var/nix and /nix/store respectively unless they're
  explicitly overriden.

Diffstat (limited to 'tests/init.sh')
-rw-r--r--tests/init.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/init.sh b/tests/init.sh
index 0ce4fe7b9f75..9beaf086d612 100644
--- a/tests/init.sh
+++ b/tests/init.sh
@@ -29,9 +29,9 @@ ln -s $TOP/scripts/nix-build $NIX_BIN_DIR/
 ln -s $TOP/scripts/nix-install-package $NIX_BIN_DIR/
 ln -s $TOP/scripts/nix-push $NIX_BIN_DIR/
 ln -s $TOP/scripts/nix-pull $NIX_BIN_DIR/
-ln -s $bzip2_bin_test/bzip2 $NIX_BIN_DIR/
-ln -s $bzip2_bin_test/bunzip2 $NIX_BIN_DIR/
 mkdir $NIX_BIN_DIR/nix
+ln -s $bzip2_bin_test/bzip2 $NIX_BIN_DIR/nix/
+ln -s $bzip2_bin_test/bunzip2 $NIX_BIN_DIR/nix/
 ln -s $TOP/scripts/copy-from-other-stores.pl $NIX_BIN_DIR/nix/
 ln -s $TOP/scripts/download-using-manifests.pl $NIX_BIN_DIR/nix/
 ln -s $TOP/scripts/readmanifest.pm $NIX_BIN_DIR/nix/