lix-project/lix
20
57
Fork 31
Code Issues 350 Code Review (Gerrit) Projects 3 Releases Wiki Activity

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

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/nix-collect-garbage.in
View file

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

4
scripts/nix-prefetch-url.in
View file

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

1
substitute.mk
View file

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