Re: [PATCH] build: fix substitution of RUNSTATEDIR in man pages

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Fri, 2019-10-18 at 15:33 +0100, Daniel P. Berrangé wrote:
> When RUNSTATEDIR was introduced
> 
>   commit d29c917ef470a25149d1f3787ec494d006549f27
>   Author: Daniel P. Berrangé <berrange@xxxxxxxxxx>
>   Date:   Tue Aug 20 16:05:12 2019 +0100
> 
>     src: honour the RUNSTATEDIR variable in all code
> 
> The makefile rules for man pages were accidentally not updated for the
> new variablle name.
> 
> Signed-off-by: Daniel P. Berrangé <berrange@xxxxxxxxxx>
> ---
>  src/Makefile.am             | 2 +-
>  src/locking/Makefile.inc.am | 2 +-
>  src/logging/Makefile.inc.am | 2 +-
>  src/remote/Makefile.inc.am  | 2 +-
>  4 files changed, 4 insertions(+), 4 deletions(-)

There are a few more instances that should be audited:

  src/util/Makefile.inc.am:               -e 's|LOCALSTATEDIR|\@localstatedir\@|g' \
  tools/Makefile.am:          -e 's|[@]localstatedir@|$(localstatedir)|' < $< > $@ \
  tools/Makefile.am:              -e 's|LOCALSTATEDIR|\@localstatedir\@|g' \
  tools/Makefile.am:              -e 's|LOCALSTATEDIR|\@localstatedir\@|g' \
  tools/Makefile.am:              -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
  tools/Makefile.am:              -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
  tools/Makefile.am:          -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
  tools/Makefile.am:          -e 's|[@]localstatedir[@]|$(localstatedir)|g' \

At least a couple of the instances in tools/ are clearly unnecessary,
while the one in src/util/ might not be but I haven't investigated in
detail :)

We should really find a way to avoid repeating the same sed(1) line
over and over again... Perhaps the switch to Meson will help in this
regard?

Anyway, the patch itself is fine, so it gets a

  Reviewed-by: Andrea Bolognani <abologna@xxxxxxxxxx>

-- 
Andrea Bolognani / Red Hat / Virtualization

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]

  Powered by Linux