On Wed, Jun 15, 2022 at 01:42:58PM +0200, Paolo Bonzini wrote: > On 6/15/22 12:52, Daniel P. Berrangé wrote: > > + case QEMU_FILE_TYPE_HELPER: > > + rel_install_dir = ""; > > + rel_build_dir = ""; > > + default_install_dir = default_helper_dir; > > + break; > > + > > You're replacing ad hoc rules in Akihiko's meson.build with an ad hoc enum + > the corresponding "case"s here in qemu_find_file(). There is duplication > anyway, in this case between Meson and QEMU (plus QEMU needs to know about > two filesystem layouts).
IMHO this is simpler to deal with than the meson additions, and also avoids the confusion of having files appearing in two places in the build dir. If we really want to have the build dir look just like the install dir though, why write custom meson commands per file type at all, instead add a rule that always invokes DESTDIR=$(BUILDDIR)/vroot ninja install to populate a dir that's guaranteed identical to the install layout Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
