From 84ff9800ff83490dd082a573e069b7b862cb9e70 Mon Sep 17 00:00:00 2001 From: Timothy Middelkoop Date: Thu, 30 Jan 2025 22:55:06 +0000 Subject: [PATCH] Fix make install when sudo does not set PWD Signed-off-by: Timothy Middelkoop --- CHANGELOG.md | 1 + Variables.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ff0f4cf..8dec7286 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Fixed - Fix default nodes.conf to use the new kernel command line list format. #1670 +- Fix `make install` when `sudo` does not set `$PWD`. #1660 ## v4.6.0rc1, 2025-01-29 diff --git a/Variables.mk b/Variables.mk index fc7c095b..8926e230 100644 --- a/Variables.mk +++ b/Variables.mk @@ -75,7 +75,7 @@ CONFIG := $(shell pwd) IPXESOURCE ?= $(PREFIX)/share/ipxe # helper functions -godeps=$(shell 2>/dev/null go list -mod vendor -deps -f '{{if not .Standard}}{{ $$dep := . }}{{range .GoFiles}}{{$$dep.Dir}}/{{.}} {{end}}{{end}}' $(1) | sed "s%${PWD}/%%g") +godeps=$(shell 2>/dev/null go list -mod vendor -deps -f '{{if not .Standard}}{{ $$dep := . }}{{range .GoFiles}}{{$$dep.Dir}}/{{.}} {{end}}{{end}}' $(1) | sed "s%$(shell pwd)/%%g") # use GOPROXY for older git clients and speed up downloads GOPROXY ?= https://proxy.golang.org