From 75820cf62d0fd6ea73c0fb558a8d472296287793 Mon Sep 17 00:00:00 2001
From: Steffen Eiden <seiden@linux.ibm.com>
Date: Fri, 8 Nov 2024 16:05:29 +0100
Subject: [PATCH] Makefile: Do not quote install targets
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Sync all install targets implementations. Some did quote the target
directories some don't. Remove all quotations. This fixes wrong install
locations of install paths that have a '~'. With quotes '~' is
interpreted literally instead of using the home dir.

Reviewed-by: Marc Hartmayer <mhartmay@linux.ibm.com>
Reviewed-by: Jan Höppner <hoeppner@linux.ibm.com>
Signed-off-by: Steffen Eiden <seiden@linux.ibm.com>
---
 genprotimg/Makefile          | 6 +++---
 genprotimg/boot/Makefile     | 6 +++---
 genprotimg/src/Makefile      | 4 ++--
 rust/Makefile                | 2 +-
 rust/pvattest/tools/Makefile | 2 +-
 zipl/boot/Makefile           | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/genprotimg/Makefile b/genprotimg/Makefile
index 6a2e37e4..c7c6d608 100644
--- a/genprotimg/Makefile
+++ b/genprotimg/Makefile
@@ -3,7 +3,7 @@ include ../common.mak
 
 .DEFAULT_GOAL := all
 
-PKGDATADIR := "$(TOOLS_DATADIR)/genprotimg"
+PKGDATADIR := $(TOOLS_DATADIR)/genprotimg
 TESTS :=
 SUBDIRS := boot src man
 RECURSIVE_TARGETS := all-recursive install-recursive clean-recursive
@@ -11,8 +11,8 @@ RECURSIVE_TARGETS := all-recursive install-recursive clean-recursive
 all: all-recursive
 
 install: install-recursive
-	$(INSTALL) -d -m 755 "$(DESTDIR)$(PKGDATADIR)"
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 samples/check_hostkeydoc "$(DESTDIR)$(PKGDATADIR)"
+	$(INSTALL) -d -m 755 $(DESTDIR)$(PKGDATADIR)
+	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 samples/check_hostkeydoc $(DESTDIR)$(PKGDATADIR)
 
 clean: clean-recursive
 
diff --git a/genprotimg/boot/Makefile b/genprotimg/boot/Makefile
index 73f3c9a8..11e4def3 100644
--- a/genprotimg/boot/Makefile
+++ b/genprotimg/boot/Makefile
@@ -86,9 +86,9 @@ stage3b.elf: head.o $(ZIPL_OBJS)
 	@chmod a-x $@
 
 install: stage3a.bin stage3b_reloc.bin
-	$(INSTALL) -d -m 755 "$(DESTDIR)$(PKGDATADIR)"
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 stage3a.bin "$(DESTDIR)$(PKGDATADIR)"
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 stage3b_reloc.bin "$(DESTDIR)$(PKGDATADIR)"
+	$(INSTALL) -d -m 755 $(DESTDIR)$(PKGDATADIR)
+	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 stage3a.bin $(DESTDIR)$(PKGDATADIR)
+	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 stage3b_reloc.bin $(DESTDIR)$(PKGDATADIR)
 
 else
 # Don't generate the dependency files (see `common.mak` for the
diff --git a/genprotimg/src/Makefile b/genprotimg/src/Makefile
index d447e6cf..cf61d7f6 100644
--- a/genprotimg/src/Makefile
+++ b/genprotimg/src/Makefile
@@ -3,14 +3,14 @@ include ../../common.mak
 
 bin_PROGRAM = genprotimg
 
-PKGDATADIR ?= "$(TOOLS_DATADIR)/genprotimg"
+PKGDATADIR ?= $(TOOLS_DATADIR)/genprotimg
 SRC_DIR := $(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 TOP_SRCDIR := $(SRC_DIR)/../
 ROOT_DIR = $(TOP_SRC_DIR)/../../
 ZIPL_DIR = $(ROOT_DIR)/zipl
 LOADER_DIR = $(TOP_SRCDIR)/boot
 
-INCLUDE_PATHS = "$(SRC_DIR)" "$(TOP_SRCDIR)" "$(ROOTDIR)/include"
+INCLUDE_PATHS = $(SRC_DIR) $(TOP_SRCDIR) $(ROOTDIR)/include
 INCLUDE_PARMS = $(addprefix -I,$(INCLUDE_PATHS))
 
 WARNINGS := -Wall -Wextra -Wshadow \
diff --git a/rust/Makefile b/rust/Makefile
index c61ece8b..df91ec7d 100644
--- a/rust/Makefile
+++ b/rust/Makefile
@@ -77,7 +77,7 @@ skip-cpacfinfo:
 all: $(BUILD_TARGETS)
 install: $(INSTALL_TARGETS)
 	$(INSTALL) -d -m 755 $(DESTDIR)$(USRBINDIR)
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 pvattest/tools/pvextract-hdr "$(DESTDIR)$(USRBINDIR)"
+	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 pvattest/tools/pvextract-hdr $(DESTDIR)$(USRBINDIR)
 
 print-rust-targets:
 	echo $(BUILD_TARGETS)
diff --git a/rust/pvattest/tools/Makefile b/rust/pvattest/tools/Makefile
index d9247127..0f3d06d1 100644
--- a/rust/pvattest/tools/Makefile
+++ b/rust/pvattest/tools/Makefile
@@ -2,4 +2,4 @@ include ../../common.mak
 
 install:
 	$(INSTALL) -d -m 755 $(DESTDIR)$(USRBINDIR)
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 pvextract-hdr "$(DESTDIR)$(USRBINDIR)"
+	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 pvextract-hdr $(DESTDIR)$(USRBINDIR)
diff --git a/zipl/boot/Makefile b/zipl/boot/Makefile
index a0fc82b5..75c9f064 100644
--- a/zipl/boot/Makefile
+++ b/zipl/boot/Makefile
@@ -96,8 +96,8 @@ stage3.exec: head.o stage3.o kdump3.o libc.o ebcdic.o ebcdic_conv.o sclp.o \
 	@chmod a-x $@
 
 install: $(EXTERNAL_BOOTLOADERS)
-	$(INSTALL) -d -m 755 "$(DESTDIR)$(TOOLS_LIBDIR)"
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 $(EXTERNAL_BOOTLOADERS) "$(DESTDIR)$(TOOLS_LIBDIR)"
+	$(INSTALL) -d -m 755 $(DESTDIR)$(TOOLS_LIBDIR)
+	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 $(EXTERNAL_BOOTLOADERS) $(DESTDIR)$(TOOLS_LIBDIR)
 else
 # Don't generate the dependency files (see `common.mak` for the
 # `-include $(dependencies_c)` statement).