Install input{,-event-types}.h to /usr/include/compat/linux too.
authorSascha Wildner <saw@online.de>
Fri, 30 Nov 2018 20:13:02 +0000 (21:13 +0100)
committerSascha Wildner <saw@online.de>
Fri, 30 Nov 2018 20:14:25 +0000 (21:14 +0100)
It helps preventing excessive patches in ravenport's weston.

It is kind of experimental, but depending on how useful it
proves to be for 3rd party software all in all, we will
eventually remove /usr/include/dev/misc/evdev in the future.

A -I /usr/include/compat is needed to get at these headers using
"#include <linux/input.h>", etc. They were not put in the default
include path to mislead configure scripts and the likes.

We will also evaluate if it is worth exposing further linux
specific headers in this directory.

It might even be that we change the new location again in the
future.

Requested-by: Peeter Must
Makefile_upgrade.inc
etc/mtree/BSD.include.dist
include/Makefile

index 2e79f42..47a46c2 100644 (file)
@@ -3152,7 +3152,6 @@ TO_REMOVE+=/usr/lib/libprivate_panelw.so.59
 TO_REMOVE+=/usr/lib/libprivate_panelw.so.60
 TO_REMOVE+=/usr/lib/profile/libprivate_panel.a
 TO_REMOVE+=/usr/lib/profile/libprivate_panelw.a
-TO_REMOVE+=/usr/include/compat
 TO_REMOVE+=/usr/include/sys/stdbool.h
 TO_REMOVE+=/usr/share/man/man3/ascftime.3.gz
 TO_REMOVE+=/usr/share/man/man3/cfree.3.gz
index ca12541..a340562 100644 (file)
             ..
         ..
     ..
+    compat
+        linux
+        ..
+    ..
     cpu
     ..
     crypto
index 6a0dfb5..6fef985 100644 (file)
@@ -179,6 +179,12 @@ copies:            mtree_setup
        cd ${.CURDIR}/../sys/dev/misc/evdev; \
                ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 input-event-codes.h \
                ${DESTDIR}/usr/include/dev/misc/evdev
+       cd ${.CURDIR}/../sys/dev/misc/evdev; \
+               ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 input.h \
+               ${DESTDIR}/usr/include/compat/linux
+       cd ${.CURDIR}/../sys/dev/misc/evdev; \
+               ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 input-event-codes.h \
+               ${DESTDIR}/usr/include/compat/linux
 .if exists(${.CURDIR}/../sys/cpu/${MACHINE_ARCH}/include)
        cd ${.CURDIR}/../sys/cpu/${MACHINE_ARCH}/include; \
                ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \