10 files changed, 18 insertions, 17 deletions
diff --git a/src/boost/format/Makefile.new b/src/boost/format/Makefile.new
index 28b66bd62d60..bbc90ca76cb5 100644
--- a/src/boost/format/Makefile.new
+++ b/src/boost/format/Makefile.new
@@ -1,5 +1,5 @@
 LIBS += libformat
 
-libformat_DIR := $(here)
+libformat_DIR := $(d)
 
 libformat_SOURCES = format_implementation.cc free_funcs.cc parsing.cc
diff --git a/src/libexpr/Makefile.new b/src/libexpr/Makefile.new
index 566436584178..3fd4fc7b2161 100644
--- a/src/libexpr/Makefile.new
+++ b/src/libexpr/Makefile.new
@@ -1,14 +1,14 @@
 LIBS += libexpr
 
-libexpr_DIR := $(here)
+libexpr_DIR := $(d)
 
 libexpr_SOURCES = \
   nixexpr.cc eval.cc primops.cc lexer-tab.cc parser-tab.cc \
   get-drvs.cc attr-path.cc value-to-xml.cc value-to-json.cc \
   common-opts.cc names.cc
 
-$(here)parser-tab.cc $(here)parser-tab.hh: $(here)parser.y
-	bison -v -o $(here)parser-tab.cc $< -d
+$(d)/parser-tab.cc $(d)/parser-tab.hh: $(d)/parser.y
+	bison -v -o $(libexpr_DIR)/parser-tab.cc $< -d
 
-$(here)lexer-tab.cc $(here)lexer-tab.hh: $(here)lexer.l
-	flex --outfile $(here)lexer-tab.cc --header-file=$(here)lexer-tab.hh $<
+$(d)/lexer-tab.cc $(d)/lexer-tab.hh: $(d)/lexer.l
+	flex --outfile $(libexpr_DIR)/lexer-tab.cc --header-file=$(libexpr_DIR)/lexer-tab.hh $<
diff --git a/src/libmain/Makefile.new b/src/libmain/Makefile.new
index 1f74cea9c9a7..b198d78422b7 100644
--- a/src/libmain/Makefile.new
+++ b/src/libmain/Makefile.new
@@ -1,6 +1,6 @@
 LIBS += libmain
 
-libmain_DIR := $(here)
+libmain_DIR := $(d)
 
 libmain_SOURCES = shared.cc stack.cc
 
diff --git a/src/libstore/Makefile.new b/src/libstore/Makefile.new
index 7b08af047e2c..2eb34b7b4252 100644
--- a/src/libstore/Makefile.new
+++ b/src/libstore/Makefile.new
@@ -1,6 +1,6 @@
 LIBS += libstore
 
-libstore_DIR := $(here)
+libstore_DIR := $(d)
 
 libstore_SOURCES = \
   store-api.cc local-store.cc remote-store.cc derivations.cc build.cc misc.cc \
diff --git a/src/libutil/Makefile.new b/src/libutil/Makefile.new
index b90c1c0cab4d..88d43f0aeb62 100644
--- a/src/libutil/Makefile.new
+++ b/src/libutil/Makefile.new
@@ -1,10 +1,11 @@
 LIBS += libutil
 
-libutil_DIR := $(here)
+libutil_DIR := $(d)
 
-libutil_SOURCES = util.cc hash.cc serialise.cc archive.cc xml-writer.cc affinity.cc \
-  md5.c sha1.c sha256.c
+libutil_SOURCES = util.cc hash.cc serialise.cc archive.cc xml-writer.cc affinity.cc
 
-# FIXME: md5.c et al. should only be built when we don't have OpenSSL.
+ifneq ($(HAVE_OPENSSL), 1)
+libutil_SOURCES += md5.c sha1.c sha256.c
+endif
 
 libutil_LIBS = src/boost/format/libformat
diff --git a/src/nix-daemon/Makefile.new b/src/nix-daemon/Makefile.new
index a2d98e790557..2a8a7d92cd26 100644
--- a/src/nix-daemon/Makefile.new
+++ b/src/nix-daemon/Makefile.new
@@ -1,6 +1,6 @@
 PROGRAMS += nix-daemon
 
-nix-daemon_DIR := $(here)
+nix-daemon_DIR := $(d)
 
 nix-daemon_SOURCES = nix-daemon.cc
 
diff --git a/src/nix-env/Makefile.new b/src/nix-env/Makefile.new
index 5c92274f3c61..303af603afa3 100644
--- a/src/nix-env/Makefile.new
+++ b/src/nix-env/Makefile.new
@@ -1,6 +1,6 @@
 PROGRAMS += nix-env
 
-nix-env_DIR := $(here)
+nix-env_DIR := $(d)
 
 nix-env_SOURCES = nix-env.cc profiles.cc profiles.hh user-env.cc user-env.hh
 
diff --git a/src/nix-hash/Makefile.new b/src/nix-hash/Makefile.new
index 87aba716cba4..462cd78d8c26 100644
--- a/src/nix-hash/Makefile.new
+++ b/src/nix-hash/Makefile.new
@@ -1,6 +1,6 @@
 PROGRAMS += nix-hash
 
-nix-hash_DIR := $(here)
+nix-hash_DIR := $(d)
 
 nix-hash_SOURCES = nix-hash.cc
 
diff --git a/src/nix-instantiate/Makefile.new b/src/nix-instantiate/Makefile.new
index 71e40706ae62..9c4cfec287d9 100644
--- a/src/nix-instantiate/Makefile.new
+++ b/src/nix-instantiate/Makefile.new
@@ -1,6 +1,6 @@
 PROGRAMS += nix-instantiate
 
-nix-instantiate_DIR := $(here)
+nix-instantiate_DIR := $(d)
 
 nix-instantiate_SOURCES = nix-instantiate.cc
 
diff --git a/src/nix-store/Makefile.new b/src/nix-store/Makefile.new
index 195d05a2d611..0b31f3a36735 100644
--- a/src/nix-store/Makefile.new
+++ b/src/nix-store/Makefile.new
@@ -1,6 +1,6 @@
 PROGRAMS += nix-store
 
-nix-store_DIR := $(here)
+nix-store_DIR := $(d)
 
 nix-store_SOURCES = nix-store.cc dotgraph.cc xmlgraph.cc