system/icon: Post-SVN clean up

- Move source code from `trunk` into program root directory.
- Update build files and ASM include paths.

programs/build_all.bat

@@ -65,7 +65,7 @@ fasm system\skincfg\trunk\skincfg.asm %BIN%\skincfg
 fasm system\docpack\docpack.asm %BIN%\docpack
 fasm system\end\trunk\end.asm %BIN%\end
 fasm system\gmon\gmon.asm %BIN%\gmon
-fasm system\icon\trunk\icon.asm %BIN%\icon
+fasm system\icon\icon.asm %BIN%\icon
 fasm system\kbd\trunk\kbd.ASM %BIN%\kbd
 fasm system\launcher\trunk\launcher.asm %BIN%\launcher
 fasm system\menu\trunk\menu.asm %BIN%\@menu

programs/system/icon/Tupfile.lua

@@ -1,5 +1,5 @@
 if tup.getconfig("NO_FASM") ~= "" then return end
-HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR")
+HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR")
 tup.include(HELPERDIR .. "/use_fasm.lua")
 add_include(tup.getvariantdir())
 

programs/system/icon/icon.asm

@@ -1,3 +1,6 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
 ;********************************
 ;*                              *
 ;*     DESKTOP ICON MANAGER     *
@@ -80,10 +83,10 @@ ICON_STRIP equ '/sys/iconstrp.png'
 	dd path		; path
 ;------------------------------------------------------------------------------
 include 'lang.inc'
-include '../../../macros.inc'
-include '../../../KOSfuncs.inc'
-include '../../../load_lib.mac'
-;include '../../../debug.inc'
+include '../../macros.inc'
+include '../../KOSfuncs.inc'
+include '../../load_lib.mac'
+;include '../../debug.inc'
 ;------------------------------------------------------------------------------
         @use_library    ;use load lib macros
 ;------------------------------------------------------------------------------