fix Makefile mismerge
tree854a87e4e2f74edcf8dddd93c65f13a0d29bc63e
-rw-r--r-- 719 .gitignore
-rw-r--r-- 665 Makefile
-rw-r--r-- 3848 README.md
-rw-r--r-- 1699 README.uname
-rw-r--r-- 212 Sconfig
drwxr-xr-x - bin
drwxr-xr-x - contrib
drwxr-xr-x - exception_lists
drwxr-xr-x - include
drwxr-xr-x - kernel
drwxr-xr-x - lib
drwxr-xr-x - share
drwxr-xr-x - tools
drwxr-xr-x - usr