> On 24 Nov 2022, at 16:42, Anthony PERARD <[email protected]> wrote: > > Use actual include directory used to install the public header in > COPYING file. > > Also, move the input file out of "tools/include/xen/" because that > directory is removed on `make clean`. > > We can't used ./configure because $includedir contain another > variable, so the change is done in Makefile. > > Fixes: 4ea75e9a9058 ("Rework COPYING installed in /usr/include/xen/, due to > several licences") > Signed-off-by: Anthony PERARD <[email protected]> > Reviewed-by: Jan Beulich <[email protected]> > --- > > Notes: > For 4.17 inclusion: > > Doing `make clean && make` in the root dir is going to fail as make > isn't going to find the COPYING file while trying to install the > includes. > > If that patch is too much, we could replace the `sed` by `cp` and just > move COPYING instead of changing it. > > tools/include/Makefile | 1 + > tools/include/{xen/COPYING => xen.COPYING.in} | 2 +- > tools/include/.gitignore | 1 + > tools/include/xen/.gitignore | 2 -- > 4 files changed, 3 insertions(+), 3 deletions(-) > rename tools/include/{xen/COPYING => xen.COPYING.in} (93%) > create mode 100644 tools/include/.gitignore > delete mode 100644 tools/include/xen/.gitignore > > diff --git a/tools/include/Makefile b/tools/include/Makefile > index f838171e8c..d69aeb54bf 100644 > --- a/tools/include/Makefile > +++ b/tools/include/Makefile > @@ -24,6 +24,7 @@ xen-foreign: > xen-dir: > mkdir -p xen/libelf acpi > find xen/ acpi/ -type l -exec rm '{}' + > + sed -e 's#@includedir@#$(includedir)/xen#g' xen.COPYING.in > xen/COPYING
If I understand correctly, the -e can be dropped as this is the only command we are issuing to sed. The patch looks good, I’ve tested it with and without the -e and it works Cheers, Luca
