diff options
author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2003-11-22T18·45+0000 |
---|---|---|
committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2003-11-22T18·45+0000 |
commit | ab0bc4999a49efbc8e1c25989662a96e32fa0cc5 (patch) | |
tree | 3864cf300fccb46a97decd2d00b8176c047a87d0 /substitute.mk | |
parent | 40d9eb14dfb842c51e9f86818b43ae7711e1a5d6 (diff) |
* Maintain integrity of the substitute and successor mappings when
deleting a path in the store. * Allow absolute paths in Nix expressions. * Get nix-prefetch-url to work again. * Various other fixes.
Diffstat (limited to 'substitute.mk')
-rw-r--r-- | substitute.mk | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/substitute.mk b/substitute.mk index 8527cf6fd1ee..c575dc0ff0a7 100644 --- a/substitute.mk +++ b/substitute.mk @@ -1,9 +1,11 @@ %: %.in Makefile sed \ - -e s^@prefix\@^$(prefix)^g \ - -e s^@bindir\@^$(bindir)^g \ - -e s^@sysconfdir\@^$(sysconfdir)^g \ - -e s^@localstatedir\@^$(localstatedir)^g \ - -e s^@wget\@^$(wget)^g \ + -e "s^@prefix\@^$(prefix)^g" \ + -e "s^@bindir\@^$(bindir)^g" \ + -e "s^@sysconfdir\@^$(sysconfdir)^g" \ + -e "s^@localstatedir\@^$(localstatedir)^g" \ + -e "s^@datadir\@^$(datadir)^g" \ + -e "s^@host\@^$(host)^g" \ + -e "s^@wget\@^$(wget)^g" \ < $< > $@ || rm $@ chmod +x $@ |