Rebase updates

Signed-off-by: jcsiadal <jeremy.c.siadal@intel.com>
This commit is contained in:
jcsiadal
2022-02-10 19:54:09 +00:00
parent c9c8a683a7
commit 378dda2ca1
3 changed files with 0 additions and 8 deletions

View File

@@ -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