[xen master] tools/include: fix clean and rework COPYING for installed Xen public header

[patchbot@xxxxxxx]

commit 25b55688e1f20ebb1bb15d0e82079e91cd787e5b
Author:     Anthony PERARD <anthony.perard@xxxxxxxxxx>
AuthorDate: Thu Dec 1 16:14:59 2022 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Thu Dec 1 16:14:59 2022 +0100

    tools/include: fix clean and rework COPYING for installed Xen public header
    
    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 <anthony.perard@xxxxxxxxxx>
    Reviewed-by: Jan Beulich <jbeulich@xxxxxxxx>
---
 tools/include/.gitignore     |  1 +
 tools/include/Makefile       |  1 +
 tools/include/xen.COPYING.in | 26 ++++++++++++++++++++++++++
 tools/include/xen/.gitignore |  2 --
 tools/include/xen/COPYING    | 26 --------------------------
 5 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/tools/include/.gitignore b/tools/include/.gitignore
new file mode 100644
index 0000000000..be14e3632d
--- /dev/null
+++ b/tools/include/.gitignore
@@ -0,0 +1 @@
+/xen/
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
        ln -s $(XEN_ROOT)/xen/include/public/*.h xen/
        ln -s $(XEN_ROOT)/xen/include/public/*/ xen/
        ln -s ../xen-sys/$(XEN_OS) xen/sys
diff --git a/tools/include/xen.COPYING.in b/tools/include/xen.COPYING.in
new file mode 100644
index 0000000000..25513fe529
--- /dev/null
+++ b/tools/include/xen.COPYING.in
@@ -0,0 +1,26 @@
+XEN NOTICE
+==========
+
+This licence applies to all files within this subdirectory ("@includedir@")
+with the exception of "sys/" which may include headers under different
+licences.
+
+=====================================================================
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
diff --git a/tools/include/xen/.gitignore b/tools/include/xen/.gitignore
deleted file mode 100644
index 0628b2daf1..0000000000
--- a/tools/include/xen/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!COPYING
diff --git a/tools/include/xen/COPYING b/tools/include/xen/COPYING
deleted file mode 100644
index fe3f9b7557..0000000000
--- a/tools/include/xen/COPYING
+++ /dev/null
@@ -1,26 +0,0 @@
-XEN NOTICE
-==========
-
-This licence applies to all files within this subdirectory ("/usr/include/xen")
-with the exception of "sys/" which may include headers under different
-licences.
-
-=====================================================================
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
--
generated by git-patchbot for /home/xen/git/xen.git#master