Oops,
I had removed patch-build-tools_icon-theme-installer (hunk below), but
after a closer look, I think it should stay.
The patch stops the script from trying to find the executable files for
the "mkinstalldirs" and "INSTALL_DATA" commands as they are passed in
from the Makefile. Instead, it will just test that they were provided
at all.
The problem is/was (going by the patch message), that the original
script would fail if these commands are not given with absolute paths.
Since the previous version, upstream has amended one of the two sites
with a call to 'which' to expand simple commands to their full path.
Nevertheless, I feel like just testing for the presence of the argument
is preferable because:
(a) The "echo | cut" logic produces bogus results. When tracing
through the various definitions that end up in, e.g.
gschem/data/Makefile, at least for mkinstalldirs, the actual
argument for me ends up being "/bin/sh ...". So all that is being
tested is that the shell exists and is executable.
(b) The script does check these commands for failure (and aborts)
when it actually calls them.
-p
Sven M. Hallberg on Tue, Mar 21 2023:
> Index: cad/geda-gaf/patches/patch-build-tools_icon-theme-installer
> ===================================================================
> RCS file: cad/geda-gaf/patches/patch-build-tools_icon-theme-installer
> diff -N cad/geda-gaf/patches/patch-build-tools_icon-theme-installer
> --- cad/geda-gaf/patches/patch-build-tools_icon-theme-installer 11 Mar
> 2022 18:24:27 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,19 +0,0 @@
> -Don't require an absolute path for the install command.
> -
> ---- build-tools/icon-theme-installer.orig Sun Apr 4 23:09:29 2010
> -+++ build-tools/icon-theme-installer Sun Apr 4 23:10:06 2010
> -@@ -103,12 +103,12 @@ if test -z "$INSTALL_BASE_DIR"; then
> - exit 1
> - fi
> -
> --if test ! -x `echo "$MKINSTALLDIRS_EXEC" | cut -f1 -d' '`; then
> -+if test -z "$MKINSTALLDIRS_EXEC"; then
> - echo "Cannot find '$MKINSTALLDIRS_EXEC'; You probably want to pass -m
> \$(mkinstalldirs)"
> - exit 1
> - fi
> -
> --if test ! -x `echo "$INSTALL_DATA_EXEC" | cut -f1 -d' '`; then
> -+if test -z "$INSTALL_DATA_EXEC"; then
> - echo "Cannot find '$INSTALL_DATA_EXEC'; You probably want to pass -x
> \$(INSTALL_DATA)"
> - exit 1
> - fi
