build: Move gcc and C++ headers

Also add more comments.

1 files changed, 24 insertions, 3 deletions

diff --git a/build b/build
index b7dda61..0479c14 100755
--- a/build
+++ b/build
@@ -67,6 +67,11 @@ tm = src/gcc/config  # Abbreviation for build-gcc-config
 libdir    = /usr/lib/$(OPK_HOST_ARCH)
 libsubdir = /usr/lib/$(OPK_HOST_ARCH)/gcc/$(target_gnu)/$(version)
 libsuffix = $$(g++ -print-multi-os-directory)
+def_gcc_gcc_include_dir          = $(libsubdir)/include
+def_gcc_fixed_include_dir        = $(libsubdir)/include-fixed
+def_gcc_gxx_include_dir          = /usr/include/c++/$(version)
+def_gcc_gxx_tool_include_dir     = $(def_gcc_gxx_include_dir)/$(target_gnu)
+def_gcc_gxx_backward_include_dir = $(def_gcc_gxx_include_dir)/backward
 # Customs:
 gccexedir = /usr/lib/$(OPK_HOST_ARCH)/$(target)/gcc/$(base_version)
 tgtlibdir = /usr/lib/$(target)/gcc/$(base_version)
@@ -163,22 +168,38 @@ install-native:
 		$(destdir)/usr/bin/$(target)-c++-$(base_version)
 	# Move files into ProteanOS-style directories.
 	mkdir -p $(destdir)$(gccexedir)
+	# gcc programs:
 	mv \
 		$(destdir)$(libsubdir)/cc1* \
 		$(destdir)$(libsubdir)/collect2 \
 		$(destdir)$(libsubdir)/lto* \
 		$(destdir)$(gccexedir)
 	mkdir -p $(destdir)$(tgtlibdir)
+	# Start files and gcc libraries:
 	mv \
 		$(destdir)$(libsubdir)/*.o \
-		$(destdir)$(libsubdir)/include* \
 		$(destdir)$(libsubdir)/*.a \
 		$(destdir)$(libsubdir)/*.spec \
 		$(destdir)$(libsubdir)/*.so \
 		$(destdir)$(tgtlibdir)
-	mkdir -p $(destdir)$(gcc_gxx_tool_include_dir)
-	mv $(destdir)/usr/include/c++-$(base_version)/$(target_gnu)/* \
+	# C++ headers:
+	mkdir -p \
+		$(destdir)$(gcc_gcc_include_dir) \
+		$(destdir)$(gcc_fixed_include_dir) \
+		$(destdir)$(gcc_gxx_include_dir) \
+		$(destdir)$(gcc_gxx_tool_include_dir) \
+		$(destdir)$(gcc_gxx_backward_include_dir)
+	mv $(destdir)$(def_gcc_gcc_include_dir)/* \
+		$(destdir)$(gcc_gcc_include_dir)
+	mv $(destdir)$(def_gcc_fixed_include_dir)/* \
+		$(destdir)$(gcc_fixed_include_dir)
+	mv $(destdir)$(def_gcc_gxx_include_dir)/* \
+		$(destdir)$(gcc_gxx_include_dir)
+	mv $(destdir)$(def_gcc_gxx_tool_include_dir)/* \
 		$(destdir)$(gcc_gxx_tool_include_dir)
+	mv $(destdir)$(def_gcc_gxx_backward_include_dir)/* \
+		$(destdir)$(gcc_gxx_backward_include_dir)
+	# Target-arch libraries:
 	mkdir -p $(destdir)$(libdir)
 	mv $(destdir)$(libdir)/$(libsuffix)/* $(destdir)$(libdir)
 	# Put libgcc_s.so.* under /lib.