From 378dda2ca180da7cce80948cb4d3a05e9232c946 Mon Sep 17 00:00:00 2001 From: jcsiadal Date: Thu, 10 Feb 2022 19:54:09 +0000 Subject: [PATCH] Rebase updates Signed-off-by: jcsiadal --- Makefile | 6 ------ internal/pkg/buildconfig/defaults.go | 1 - internal/pkg/buildconfig/setconfigs.go.in | 1 - 3 files changed, 8 deletions(-) diff --git a/Makefile b/Makefile index e7ecbcce..33288439 100644 --- a/Makefile +++ b/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 diff --git a/internal/pkg/buildconfig/defaults.go b/internal/pkg/buildconfig/defaults.go index c14db9b0..43f31a0f 100644 --- a/internal/pkg/buildconfig/defaults.go +++ b/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 { diff --git a/internal/pkg/buildconfig/setconfigs.go.in b/internal/pkg/buildconfig/setconfigs.go.in index b3ed934d..1b2bbdea 100644 --- a/internal/pkg/buildconfig/setconfigs.go.in +++ b/internal/pkg/buildconfig/setconfigs.go.in @@ -15,5 +15,4 @@ func init() { wwclientdir = "@WWCLIENTDIR@" version = "@VERSION@" release = "@RELEASE@" - wwclientloc = "@WWCLIENTLOC" }