cmake: Correct path for addon includes.

Was incorrectly defined in KallistiOS#1035. The addons
include DIR does not separate by arch. It's
expected the headers would be shared across
archs. This then rolls back KallistiOS#1109 which was
done in order to work around the incorrect
definition that was provided in KallistiOS#1035.

Author: QuzarDC

environ_base.sh

@@ -26,7 +26,7 @@ fi
 
 # Our includes.
 export KOS_INC_PATHS="${KOS_INC_PATHS} -I${KOS_BASE}/include \
--I${KOS_BASE}/kernel/arch/${KOS_ARCH}/include -I${KOS_BASE}/addons/include/ -I${KOS_BASE}/addons/include/${KOS_ARCH} \
+-I${KOS_BASE}/kernel/arch/${KOS_ARCH}/include -I${KOS_BASE}/addons/include/ \
 -I${KOS_PORTS}/include"
 
 # "System" libraries.

utils/cmake/kallistios.toolchain.cmake

@@ -94,7 +94,7 @@ set(CMAKE_EXE_LINKER_FLAGS_DEBUG -fno-lto)
 # Default CMake installations to install to kos-addons
 set(CMAKE_INSTALL_BINDIR     ${DC_TOOLS_BASE})
 if(NOT DEFINED CMAKE_INSTALL_INCLUDEDIR)
-    set(CMAKE_INSTALL_INCLUDEDIR ${KOS_ADDONS}/include/${KOS_ARCH})
+    set(CMAKE_INSTALL_INCLUDEDIR ${KOS_ADDONS}/include)
 endif()
 if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
     set(CMAKE_INSTALL_LIBDIR ${KOS_ADDONS}/lib/${KOS_ARCH})