From: John Darrington <john@darrington.wattle.id.au>
Date: Sun, 18 Apr 2021 05:06:54 +0000 (+0200)
Subject: Windows/automake.mk: Use more portable code
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d887a2a35c475ac7bf817db4861d9fc191f6a8bd;p=pspp

Windows/automake.mk: Use more portable code

* Windows/automake.mk (environment_dir): Avoid GNU Make extensions
* Windows/automake.mk (libgcc_dir): Avoid GNU Make extensions

Suggested-by: Ben Praff <blp@gnu.org>
---

diff --git a/Windows/automake.mk b/Windows/automake.mk
index 918c0b179f..8c362caf0d 100644
--- a/Windows/automake.mk
+++ b/Windows/automake.mk
@@ -23,8 +23,8 @@ nsis_installer_deps=$(DESTDIR)$(prefix)/share/doc/pspp/pspp.html \
 	$(DESTDIR)$(prefix)/share/doc/pspp/pspp.pdf \
 	Windows/AdvUninstLog.nsh Windows/MUI_EXTRAPAGES.nsh
 
-environment_dir=${shell echo $(LDFLAGS) | sed -e 's/^-L//' -e 's|/lib$$||'}
-libgcc_dir=${dir ${shell $(CC) -print-libgcc-file-name}}
+environment_dir = $$(echo $(LDFLAGS) | $(SED) -e 's/^-L//' -e 's|/lib$$||')
+libgcc_dir = $$(dirname $$($(CC) -print-libgcc-file-name))
 
 # Note that install is a PHONY target.  Therefore this rule is always executed.
 Windows/nsis-bin: install