Commit 5fdd699f authored by Mike Hibler's avatar Mike Hibler

Minor tweaks for build on 10.1.

parent 72c99cc2
......@@ -63,12 +63,13 @@ sub Install($$$)
if ($FBSD_MAJOR >= 6) {
my $pf1 = "$VARRUN/named.pid";
my $pf2 = "$VARRUN/named/named.pid";
unlink($pf1, $pf2);
my $pf3 = "$VARRUN/named/pid";
unlink($pf1, $pf2, $pf3);
if (ExecQuiet("$named_control start")) {
PhaseFail("Unable to start named");
}
sleep 1;
if (! -e $pf1 && ! -e $pf2) {
if (! -e $pf1 && ! -e $pf2 && ! -e $pf3) {
PhaseFail("Unable to start named");
}
} else {
......
#
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
# Copyright (c) 2000-2014 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -65,7 +65,7 @@ genlastlog: genlastlog.c
-DUSERNODE='"$(USERNODE)"' \
-DLOG_TESTBED=$(LOG_TESTBED) \
-o genlastlog $< ${TESTBED_LIBOBJDIR}/libtb/libtb.a \
-L/usr/local/lib/mysql -lmysqlclient
-L/usr/local/lib/mysql -lmysqlclient -lz
install: $(addprefix $(INSTALL_LIBEXECDIR)/, $(BINS)) \
$(addprefix $(INSTALL_SBINDIR)/, $(SBINS)) \
......
......@@ -52,7 +52,7 @@ LDFLAGS += $(LDSTATIC)
#
CFLAGS += -DETCDIR='"$(INSTALL_ETCDIR)"'
SSLFLAGS = -DWITHSSL
TMLIBS += -lssl -lcrypto
TMLIBS += -lssl -lcrypto -lcrypt
NOTPMLIB = ${TESTBED_LIBOBJDIR}/tmcd/libtmcd.a
ifeq ($(SYSTEM),Linux)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment