From e8154b3ec6ee48d99483f2e150f64439e96236ab Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Sat, 18 May 2019 18:55:14 -0400
Subject: build: Rename prefix macros

---
diff --git a/build b/build
index 16d199c..1b948c7 100755
--- a/build
+++ b/build
@@ -68,8 +68,8 @@ libdir    = /usr/lib/$(OPK_HOST_ARCH)
 libsubdir = /usr/lib/$(OPK_HOST_ARCH)/gcc/$(target_gnu)/$(version)
 libsuffix = $$(g++ -print-multi-os-directory)
 # Customs:
-exec_prefix      = /usr/lib/$(OPK_HOST_ARCH)/$(target)/gcc-$(base_version)
-startfile_prefix = /usr/lib/$(target)/gcc-$(base_version)
+gccexedir = /usr/lib/$(OPK_HOST_ARCH)/$(target)/gcc-$(base_version)
+tgtlibdir = /usr/lib/$(target)/gcc-$(base_version)
 include_prefix   = /usr/lib/$(target)/gcc-$(base_version)
 gcc_gxx_tool_include_dir = /usr/include/$(target)/c++-$(base_version)
 dir_macros = \
@@ -114,9 +114,9 @@ build-gcc-config:
 	sed "s|^\(#define $(tm_interp_macro)\) \".*\"$$|\1 \"$(elf_interp)\"|" \
 		"$(tm)/$(tm_file).orig" >"$(tm)/$(tm_file)"
 	printf '\n#undef %s\n#define %s "%s"\n' STANDARD_EXEC_PREFIX \
-		STANDARD_EXEC_PREFIX "$(exec_prefix)" >>"$(tm)/$(tm_file)"
+		STANDARD_EXEC_PREFIX "$(tgtlibdir)" >>"$(tm)/$(tm_file)"
 	printf '\n#undef %s\n#define %s "%s"\n' STANDARD_LIBEXEC_PREFIX \
-		STANDARD_LIBEXEC_PREFIX "$(startfile_prefix)" >>"$(tm)/$(tm_file)"
+		STANDARD_LIBEXEC_PREFIX "$(gccexedir)" >>"$(tm)/$(tm_file)"
 	printf '#define %s ""\n' STANDARD_STARTFILE_PREFIX_1 \
 		STANDARD_STARTFILE_PREFIX_2 >>"$(tm)/$(tm_file)"
 	[ -e "$(tm)/$(tmake_file).orig" ] || \
@@ -158,20 +158,20 @@ install-native:
 	ln -s $(target)-g++-$(base_version) \
 		$(destdir)/usr/bin/$(target)-c++-$(base_version)
 	# Move files into ProteanOS-style directories.
-	mkdir -p $(destdir)$(exec_prefix)
+	mkdir -p $(destdir)$(gccexedir)
 	mv \
 		$(destdir)$(libsubdir)/cc1* \
 		$(destdir)$(libsubdir)/collect2 \
 		$(destdir)$(libsubdir)/lto* \
-		$(destdir)$(exec_prefix)
-	mkdir -p $(destdir)$(startfile_prefix)
+		$(destdir)$(gccexedir)
+	mkdir -p $(destdir)$(tgtlibdir)
 	mv \
 		$(destdir)$(libsubdir)/*.o \
 		$(destdir)$(libsubdir)/include* \
 		$(destdir)$(libsubdir)/*.a \
 		$(destdir)$(libsubdir)/*.spec \
 		$(destdir)$(libsubdir)/*.so \
-		$(destdir)$(startfile_prefix)
+		$(destdir)$(tgtlibdir)
 	mkdir -p $(destdir)$(gcc_gxx_tool_include_dir)
 	mv $(destdir)/usr/include/c++-$(base_version)/$(target_gnu)/* \
 		$(destdir)$(gcc_gxx_tool_include_dir)
@@ -229,12 +229,12 @@ install-cross:
 	ln -s $(target)-g++-$(base_version) \
 		$(destdir)/usr/bin/$(target)-c++-$(base_version)
 	# Move files into ProteanOS-style directories.
-	mkdir -p $(destdir)$(exec_prefix)
+	mkdir -p $(destdir)$(gccexedir)
 	mv \
 		$(destdir)$(libsubdir)/cc1* \
 		$(destdir)$(libsubdir)/collect2 \
 		$(destdir)$(libsubdir)/lto* \
-		$(destdir)$(exec_prefix)
+		$(destdir)$(gccexedir)
 	rm -Rf \
 		$(destdir)$(libsubdir)/*.o \
 		$(destdir)$(libsubdir)/include* \
--
cgit v0.9.1