From 754c05ed6c3b88f8180ae8686e030b5b02b23d43 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 22 Nov 2013 16:45:52 +0000
Subject: Rename $(here) to $(d) for brevity, and remove trailing slash

---
 src/libutil/Makefile.new | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/libutil')

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
-- 
cgit 1.4.1