From ab70abec42a5000a4e4a2af7ba658d464651c9bd Mon Sep 17 00:00:00 2001 From: P. J. McDermott Date: Mon, 22 Apr 2013 13:49:13 -0400 Subject: source.mk: Use lowercase letters in local macros. --- diff --git a/source.mk b/source.mk index 278bc18..26bcac0 100644 --- a/source.mk +++ b/source.mk @@ -1,4 +1,4 @@ -NON_FREE_FILES = \ +non_free_files = \ gcc/doc/fsf-funding.7 \ gcc/doc/g++.1 \ gcc/doc/gcc.1 \ @@ -18,7 +18,7 @@ NON_FREE_FILES = \ gcc/fortran/invoke.texi \ libgomp/libgomp.info \ libgomp/libgomp.texi -NEEDED_FILES = \ +needed_files = \ gcc/doc/gcc.texi \ gcc/doc/invoke.texi \ gcc/doc/gcov.texi \ @@ -26,35 +26,35 @@ NEEDED_FILES = \ gcc/doc/gccint.texi \ libgomp/libgomp.texi -UPSTREAM_VER = $$(printf '%s\n' '$(OPK_SOURCE_VERSION_UPSTREAM)' | \ +upstream_ver = $$(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) -SOURCE_ARCHIVE = ../$(OPK_SOURCE)-$(OPK_SOURCE_VERSION_UPSTREAM).orig.tar.bz2 -GCC_KEYS = 745C015A B75C61B8 902C9419 F71EDF1C FC26A641 C3C45C06 +upstream_archive = gcc-$(upstream_ver).tar.bz2 +upstream_url = http://ftp.gnu.org/gnu/gcc/gcc-$(upstream_ver)/$(upstream_archive) +source_archive = ../$(OPK_SOURCE)-$(OPK_SOURCE_VERSION_UPSTREAM).orig.tar.bz2 +gcc_keys = 745C015A B75C61B8 902C9419 F71EDF1C FC26A641 C3C45C06 -$(SOURCE_ARCHIVE): - wget "$(UPSTREAM_URL)" +$(source_archive): + wget "$(upstream_url)" if gpg --version >/dev/null 2>&1; then \ - wget "$(UPSTREAM_URL).sig" && \ + wget "$(upstream_url).sig" && \ { \ [ -e ../gcc-keyring.gpg ] || \ gpg --keyring ../gcc-keyring.gpg --no-default-keyring \ - --recv-keys $(GCC_KEYS); \ + --recv-keys $(gcc_keys); \ } && \ gpg --verify --keyring ../gcc-keyring.gpg \ - "$(UPSTREAM_ARCHIVE).sig" || \ + "$(upstream_archive).sig" || \ exit ${?}; \ fi - tar -xjf "$(UPSTREAM_ARCHIVE)" - for file in $(NON_FREE_FILES); do \ - rm -f "gcc-$(UPSTREAM_VER)/$${file}"; \ + tar -xjf "$(upstream_archive)" + for file in $(non_free_files); do \ + rm -f "gcc-$(upstream_ver)/$${file}"; \ done - for file in $(NEEDED_FILES); do \ - >"gcc-$(UPSTREAM_VER)/$${file}"; \ + for file in $(needed_files); do \ + >"gcc-$(upstream_ver)/$${file}"; \ done - tar -cjf '$(SOURCE_ARCHIVE)' "gcc-$(UPSTREAM_VER)" - rm -Rf "gcc-$(UPSTREAM_VER)" - rm -f "$(UPSTREAM_ARCHIVE)" + tar -cjf '$(source_archive)' "gcc-$(upstream_ver)" + rm -Rf "gcc-$(upstream_ver)" + rm -f "$(upstream_archive)" -source: $(SOURCE_ARCHIVE) +source: $(source_archive) -- cgit v0.9.1