* Use $(storedir) instead of $(prefix)/store.

This commit is contained in:
Eelco Dolstra 2004-02-20 11:32:30 +00:00
parent dbf547645d
commit 7f0ed370da
3 changed files with 4 additions and 3 deletions

View File

@ -4,7 +4,7 @@ use strict;
use IPC::Open2;
my $linkdir = "@localstatedir@/nix/profiles";
my $storedir = "@prefix@/store";
my $storedir = "@storedir@";
my %alive;

View File

@ -8,7 +8,7 @@ defined $url or die;
print "fetching $url...\n";
my $out = "@prefix@/store/nix-prefetch-url-$$";
my $out = "@storedir@/nix-prefetch-url-$$";
system "@wget@ --passive-ftp '$url' -O '$out'";
$? == 0 or die "unable to fetch $url";
@ -19,7 +19,7 @@ chomp $hash;
print "file has hash $hash\n";
my $out2 = "@prefix@/store/nix-prefetch-url-$hash";
my $out2 = "@storedir@/nix-prefetch-url-$hash";
rename $out, $out2;
# Create a Nix expression.

View File

@ -6,6 +6,7 @@
-e "s^@localstatedir\@^$(localstatedir)^g" \
-e "s^@datadir\@^$(datadir)^g" \
-e "s^@libexecdir\@^$(libexecdir)^g" \
-e "s^@storedir\@^$(storedir)^g" \
-e "s^@system\@^$(system)^g" \
-e "s^@wget\@^$(wget)^g" \
-e "s^@version\@^$(VERSION)^g" \