source.mk: Shorten some strings.

1 files changed, 7 insertions, 7 deletions

diff --git a/source.mk b/source.mk
index 26bcac0..6f24951 100644
--- a/source.mk
+++ b/source.mk
@@ -26,10 +26,10 @@ needed_files = \
 	gcc/doc/gccint.texi \
 	libgomp/libgomp.texi
 
-upstream_ver = $$(printf '%s\n' '$(OPK_SOURCE_VERSION_UPSTREAM)' | \
+upstream_name = gcc-$$(printf '%s\n' '$(OPK_SOURCE_VERSION_UPSTREAM)' | \
 	sed 's/^\([0-9a-z.~-][0-9a-z.~-]*\)+sip[1-9][0-9]*.*$$/\1/')
-upstream_archive = gcc-$(upstream_ver).tar.bz2
-upstream_url = http://ftp.gnu.org/gnu/gcc/gcc-$(upstream_ver)/$(upstream_archive)
+upstream_archive = $(upstream_name).tar.bz2
+upstream_url = http://ftp.gnu.org/gnu/gcc/$(upstream_name)/$(upstream_archive)
 source_archive = ../$(OPK_SOURCE)-$(OPK_SOURCE_VERSION_UPSTREAM).orig.tar.bz2
 gcc_keys = 745C015A B75C61B8 902C9419 F71EDF1C FC26A641 C3C45C06
 
@@ -48,13 +48,13 @@ $(source_archive):
 	fi
 	tar -xjf "$(upstream_archive)"
 	for file in $(non_free_files); do \
-		rm -f "gcc-$(upstream_ver)/$${file}"; \
+		rm -f "$(upstream_name)/$${file}"; \
 	done
 	for file in $(needed_files); do \
-		>"gcc-$(upstream_ver)/$${file}"; \
+		>"$(upstream_name)/$${file}"; \
 	done
-	tar -cjf '$(source_archive)' "gcc-$(upstream_ver)"
-	rm -Rf "gcc-$(upstream_ver)"
+	tar -cjf '$(source_archive)' "$(upstream_name)"
+	rm -Rf "$(upstream_name)"
 	rm -f "$(upstream_archive)"
 
 source: $(source_archive)