Rebase updates

Signed-off-by: jcsiadal <jeremy.c.siadal@intel.com>

Makefile

@@ -32,11 +32,6 @@ SYSCONFDIR ?= $(PREFIX)/etc
 SRVDIR ?= /srv
 DATADIR ?= $(PREFIX)/share
 MANDIR ?= $(DATADIR)/man
-<<<<<<< HEAD
-LOCALSTATEDIR ?= $(PREFIX)/var
-WWCLIENTLOC ?= /warewulf/bin
-
-=======
 DOCDIR ?= $(DATADIR)/doc
 LOCALSTATEDIR ?= /var
 SHAREDSTATEDIR ?= /var/local
@@ -49,7 +44,6 @@ endif
 ifeq ($(OS),ubuntu)
 TFTPDIR ?= /srv/tftp
 endif
->>>>>>> 7b0a40a... Updates specfile to match distro guidelines. Suppots modifying client directory path at build time.
 TFTPDIR ?= /var/lib/tftpboot
 FIREWALLDDIR ?= /usr/lib/firewalld/services
 SYSTEMDDIR ?= /usr/lib/systemd/system

internal/pkg/buildconfig/defaults.go

@@ -17,7 +17,6 @@ var (
 	wwclientdir    string = "UNDEF"
 	version        string = "UNDEF"
 	release        string = "UNDEF"
-	wwclientloc    string = "UNDEF"
 )
 
 func BINDIR() string {

internal/pkg/buildconfig/setconfigs.go.in

@@ -15,5 +15,4 @@ func init() {
     wwclientdir = "@WWCLIENTDIR@"
     version = "@VERSION@"
     release = "@RELEASE@"
-    wwclientloc = "@WWCLIENTLOC"
 }