Windows/automake.mk: Use more portable code
authorJohn Darrington <john@darrington.wattle.id.au>
Sun, 18 Apr 2021 05:06:54 +0000 (07:06 +0200)
committerJohn Darrington <john@darrington.wattle.id.au>
Sun, 18 Apr 2021 05:39:33 +0000 (07:39 +0200)
* 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>
Windows/automake.mk

index 918c0b179fe9b74b0516b3bc7779f62885f519b1..8c362caf0d48899557e70209dad606f25273b011 100644 (file)
@@ -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