Re: [PATCH] systemd/*: Use @SBINDIR@.

[Gary E. Miller]

Yo Ladislav!

I applied the @ICONDIR@ patch.  Clearly that is a run time, not
install time, variable.  So DESTDIR should not be applied.

If @SHAREPATH@ is not used, then maybe that should be fixed, maybe
removed. But that is not a hard bug.  Maybe it becomes a hard bug if
someone needs it to properly make their package.

We are in the final cleanup, bug fixes only, removing unused variables
is not a bug fix, but a cleanup.

On Mon, 3 Aug 2020 14:39:46 +0200
Ladislav Michl <ladis@linux-mips.org> wrote:

> On Mon, Aug 03, 2020 at 07:34:54AM -0400, Greg Troxel wrote:
> > This seems like a major conceptual problem in our SConstruct.
> > Basically, when scons does an install it should use destdir
> > (always) and when a path is substituted it should not (always).
> > Maybe that's not 100% right, but it seems obvious.  
> 
> After yet another quick look it seems that @SHAREPATH@ introduced by
> a654b3107d378230 "SConstruct: Install doc in share/gpsd/doc" is not
> used at all and @ICONPATH@ should be fixed. Then we are 100% right :)
> Gary? James?
> 
> diff --git a/SConstruct b/SConstruct
> index d91f5b067..be406ce7f 100644
> --- a/SConstruct
> +++ b/SConstruct
> @@ -2064,7 +2064,7 @@ substmap = (
>      ('@GPSAPIVERMAJ@', api_version_major),
>      ('@GPSAPIVERMIN@', api_version_minor),
>      ('@GPSPACKET@',  packet_ffi_shared[0].get_path()),
> -    ('@ICONPATH@',   installdir('icondir')),
> +    ('@ICONPATH@',   installdir('icondir', add_destdir=False)),
>      ('@INCLUDEDIR@', installdir('includedir', add_destdir=False)),
>      ('@IRCCHAN@',    ircchan),
>      ('@ISSUES@',     'https://gitlab.com/gpsd/gpsd/issues'),
> @@ -2082,7 +2082,6 @@ substmap = (
>      ('@RUNDIR@',     env['rundir']),
>      ('@SBINDIR@',    installdir('sbindir', add_destdir=False)),
>      ('@SCPUPLOAD@',  scpupload),
> -    ('@SHAREPATH@',  installdir('sharedir')),
>      ('@SITENAME@',   sitename),
>      ('@SITESEARCH@', sitesearch),
>      ('@SUPPORT@',    'https://gpsd.io/SUPPORT.html'),
> 




RGDS
GARY
---------------------------------------------------------------------------
Gary E. Miller Rellim 109 NW Wilmington Ave., Suite E, Bend, OR 97703
        gem@rellim.com  Tel:+1 541 382 8588

            Veritas liberabit vos. -- Quid est veritas?
    "If you can't measure it, you can't improve it." - Lord Kelvin

pgp6ZBBgiBZcO.pgp
Description: OpenPGP digital signature