From ab0bc4999a49efbc8e1c25989662a96e32fa0cc5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 22 Nov 2003 18:45:56 +0000 Subject: * 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. --- substitute.mk | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'substitute.mk') diff --git a/substitute.mk b/substitute.mk index 8527cf6fd1..c575dc0ff0 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 $@ -- cgit 1.4.1