From 8f8d8fd7dcdd365b1127a382848df953e95efe37 Mon Sep 17 00:00:00 2001
From: Lee Duncan <lduncan@suse.com>
Date: Mon, 4 Apr 2022 10:10:34 -0700
Subject: Build: use upper- vs lower-case variable names correctly

For the files we insall from etc/Makefile, this avoids
prepending with DESTDIR twice.
---
 etc/Makefile | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'etc')

diff --git a/etc/Makefile b/etc/Makefile
index 84e0fa7..cdd27e6 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -13,9 +13,9 @@ SBINDIR ?= /sbin
 
 ISCSI_INAME ?= $(TOPDIR)/utils/iscsi-iname
 
-systemddir ?= $(DESTDIR)$(prefix)/lib/systemd
+systemddir ?= $(prefix)/lib/systemd
 etcdir = /etc
-initddir ?= $(DESTDIR)$(etcdir)/init.d
+initddir ?= $(etcdir)/init.d
 
 HOMEDIR ?= $(etcdir)/iscsi
 
@@ -30,8 +30,8 @@ SYSTEMD_TEMPLATE_FILES	= iscsi-init.service.template \
 			  iscsiuio.service.template
 SYSTEMD_TEMPLATES	= $(addprefix systemd/,$(SYSTEMD_TEMPLATE_FILES))
 SYSTEMD_GENERATED_SERVICE_FILES	= $(SYSTEMD_TEMPLATES:.template=)
-SYSTEMD_DEST_FILES	= $(addprefix $(systemddir)/system/,$(SYSTEMD_SOURCE_FILES)) \
-			  $(addprefix $(systemddir)/system/,$(notdir $(SYSTEMD_GENERATED_SERVICE_FILES)))
+SYSTEMD_DEST_FILES	= $(addprefix $(DESTDIR)$(systemddir)/system/,$(SYSTEMD_SOURCE_FILES)) \
+			  $(addprefix $(DESTDIR)$(systemddir)/system/,$(notdir $(SYSTEMD_GENERATED_SERVICE_FILES)))
 IFACE_FILES		= iface.example
 IFACE_DEST_FILES	= $(addprefix $(DESTDIR)$(DBROOT)/ifaces/,$(IFACE_FILES))
 ETC_FILES		= iscsid.conf
@@ -56,24 +56,24 @@ install_etc: $(DESTDIR)$(HOMEDIR) $(ETC_DEST_FILES)
 $(ETC_DEST_FILES): $(DESTDIR)$(HOMEDIR)/%: %
 	$(INSTALL) -m 644 $? $@
 
-install_initd_distro = $(INSTALL) -m 755 $(1) $(initddir)/open-iscsi/
+install_initd_distro = $(INSTALL) -m 755 $(1) $(DESTDIR)$(initddir)/open-iscsi/
 
-install_initd: $(initddir)/open-iscsi
+install_initd: $(DESTDIR)$(initddir)/open-iscsi
 	@if [ -f /etc/debian_version ]; then \
 		$(call install_initd_distro,initd/initd.redhat) ; \
 	elif [ -f /etc/redhat-release ]; then \
 		$(call install_initd_distro,initd/initd.debian) ; \
 	fi
 
-install_initd_redhat: $(initddir)/open-iscsi
+install_initd_redhat: $(DESTDIR)$(initddir)/open-iscsi
 	$(call install_initd_distro,initd/initd.redhat)
 
-install_initd_debian: $(initddir)/open-iscsi
+install_initd_debian: $(DESTDIR)$(initddir)/open-iscsi
 	$(call install_initd_distro,initd/initd.debian)
 
-install_systemd: $(systemddir)/system $(SYSTEMD_DEST_FILES)
+install_systemd: $(DESTDIR)$(systemddir)/system $(SYSTEMD_DEST_FILES)
 
-$(SYSTEMD_DEST_FILES): $(systemddir)/system/%: systemd/%
+$(SYSTEMD_DEST_FILES): $(DESTDIR)$(systemddir)/system/%: systemd/%
 	$(INSTALL) $? $@
 
 install_iname: $(DESTDIR)$(HOMEDIR) $(ISCSI_INAME)
@@ -90,7 +90,8 @@ $(ISCSI_INAME):
 	$(MAKE) $(MFLAGS) -c $(TOPDIR)/utils $(notdir $@)
 
 # make needed directories
-$(systemddir)/system $(DESTDIR)$(HOMEDIR) $(DESTDIR)$(DBROOT)/ifaces $(initddir)/open-iscsi:
+$(DESTDIR)$(systemddir)/system $(DESTDIR)$(HOMEDIR) \
+		$(DESTDIR)$(DBROOT)/ifaces $(DESTDIR)$(initddir)/open-iscsi:
 	[ -d $@ ] || $(INSTALL) -d -m 775 $@
 
 clean:
-- 
cgit v1.2.1