From a0ae49496bd507b17d306ebace6691fe721f1638 Mon Sep 17 00:00:00 2001
From: Kris Moore <kris@pcbsd.org>
Date: Thu, 17 Dec 2015 14:19:29 -0500
Subject: [PATCH 1/3] Fix some issues compiling sysadm locally without it
 installed to /usr/local

---
 src/server/WebBackend.cpp | 6 +++---
 src/server/server.pro     | 7 +++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/server/WebBackend.cpp b/src/server/WebBackend.cpp
index 66801a5..d29ab71 100644
--- a/src/server/WebBackend.cpp
+++ b/src/server/WebBackend.cpp
@@ -6,8 +6,8 @@
 #include <WebSocket.h>
 
 //sysadm library interface classes
-#include <sysadm-general.h>
-#include <sysadm-network.h>
+#include "sysadm-general.h"
+#include "sysadm-network.h"
 
 #include "syscache-client.h"
 #include "dispatcher-client.h"
@@ -65,4 +65,4 @@ void WebSocket::EvaluateBackendRequest(QString name, const QJsonValue args, QJso
     }
   } //end array of inputs
   
-}
\ No newline at end of file
+}
diff --git a/src/server/server.pro b/src/server/server.pro
index 73e8b0f..46bb74e 100644
--- a/src/server/server.pro
+++ b/src/server/server.pro
@@ -27,7 +27,6 @@ target.path=/usr/local/bin
 INSTALLS += target
 
 
-QMAKE_LIBDIR = /usr/local/lib/qt5 /usr/local/lib
-
-INCLUDEPATH += /usr/local/include
-LIBS += -L../library -L/usr/local/lib -lpam -lutil -lsysadm
\ No newline at end of file
+QMAKE_LIBDIR = ../library /usr/local/lib/qt5 /usr/local/lib
+INCLUDEPATH += ../library /usr/local/include
+LIBS += -L../library -L/usr/local/lib -lpam -lutil -lsysadm

From 27f37a97674f2c87198ca26afd8a731408d00a3b Mon Sep 17 00:00:00 2001
From: Kris Moore <kris@pcbsd.org>
Date: Thu, 17 Dec 2015 14:21:05 -0500
Subject: [PATCH 2/3] Rename pcbsd-sysadm rc.d -> sysadm

---
 src/rc.d/{pcbsd-sysadm => sysadm} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/rc.d/{pcbsd-sysadm => sysadm} (100%)

diff --git a/src/rc.d/pcbsd-sysadm b/src/rc.d/sysadm
similarity index 100%
rename from src/rc.d/pcbsd-sysadm
rename to src/rc.d/sysadm

From e7a7ed7dbb36d583d0d00c0fea1b028956d579a6 Mon Sep 17 00:00:00 2001
From: Kris Moore <kris@pcbsd.org>
Date: Thu, 17 Dec 2015 14:22:39 -0500
Subject: [PATCH 3/3] Rename syscache -> sysadm

---
 src/rc.d/sysadm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rc.d/sysadm b/src/rc.d/sysadm
index b7fa232..9aef8b8 100755
--- a/src/rc.d/sysadm
+++ b/src/rc.d/sysadm
@@ -15,7 +15,7 @@
 name="sysadm"
 rcvar=sysadm_enable
 
-command="/usr/local/bin/syscache-server"
+command="/usr/local/bin/sysadm-server"
 start_cmd="sysadm_start"
 stop_cmd="sysadm_stop"