diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-01-21T14·30+0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-01-21T14·30+0100 |
| commit | 81628a6ccc6ce496735b22492bee15c9ad46f072 (patch) | |
| tree | d1ec18b84514d2f44700082f8d800efb929a7678 /substitute.mk | |
| parent | b1db599dd05e86f65e73dc40584913e6e78c2bac (diff) | |
| parent | 5ef8508a92997dbd7f8aa501b64fd283fb1c7bb8 (diff) | |
Merge branch 'master' into make
Conflicts: src/libexpr/eval.cc
Diffstat (limited to 'substitute.mk')
| -rw-r--r-- | substitute.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/substitute.mk b/substitute.mk index 967ad257b660..d90bded78a7d 100644 --- a/substitute.mk +++ b/substitute.mk @@ -35,6 +35,7 @@ -e "s^@version\@^$(VERSION)^g" \ -e "s^@perlbindings\@^$(perlbindings)^g" \ -e "s^@testPath\@^$(coreutils):$$(dirname $$(type -p expr))^g" \ + -e "s^@openssl\@^$(openssl_prog)^g" \ < $< > $@ || rm $@ if test -x $<; then chmod +x $@; fi |