build, targets.d/*.mk: Shorten gcc config macro names

1 files changed, 13 insertions, 13 deletions

diff --git a/build b/build
index 81646cb..f06b886 100755
--- a/build
+++ b/build
@@ -108,21 +108,21 @@ build-gcc-config:
 	# These commands run once per target, but they modify files in the src/
 	# directory that other targets might also use, so backups are made.
 	set -e; \
-	[ -e "src/gcc/config/$(gcc_config_file).orig" ] || \
-		mv "src/gcc/config/$(gcc_config_file)" \
-			"src/gcc/config/$(gcc_config_file).orig"; \
-	define_pattern=".define $(gcc_config_interp_macro)"; \
+	[ -e "src/gcc/config/$(tm_file).orig" ] || \
+		mv "src/gcc/config/$(tm_file)" \
+			"src/gcc/config/$(tm_file).orig"; \
+	define_pattern=".define $(tm_interp_macro)"; \
 	sed "s|^\($${define_pattern}\) \".*\"$$|\1 \"$(elf_interp)\"|" \
-		"src/gcc/config/$(gcc_config_file).orig" \
-		>"src/gcc/config/$(gcc_config_file)"; \
-	[ -e "src/gcc/config/$(gcc_config_fragment).orig" ] || \
-		mv "src/gcc/config/$(gcc_config_fragment)" \
-			"src/gcc/config/$(gcc_config_fragment).orig"; \
-	sed "$(gcc_config_fragment_script)" \
-		"src/gcc/config/$(gcc_config_fragment).orig" \
-		>"src/gcc/config/$(gcc_config_fragment)"; \
+		"src/gcc/config/$(tm_file).orig" \
+		>"src/gcc/config/$(tm_file)"; \
+	[ -e "src/gcc/config/$(tmake_file).orig" ] || \
+		mv "src/gcc/config/$(tmake_file)" \
+			"src/gcc/config/$(tmake_file).orig"; \
+	sed "$(tmake_script)" \
+		"src/gcc/config/$(tmake_file).orig" \
+		>"src/gcc/config/$(tmake_file)"; \
 	printf '\nMULTIARCH_DIRNAME = %s\n' "$(target)" \
-		>>"src/gcc/config/$(gcc_config_fragment)"
+		>>"src/gcc/config/$(tmake_file)"
 
 build-native: build-gcc-config
 	oh-autobuild -B "$(builddir)" -T $(native_target) -- \