diff options
| author | Volker Grabsch <vog@notjusthosting.com> | 2008-11-08 15:27:17 (GMT) |
|---|---|---|
| committer | Volker Grabsch <vog@notjusthosting.com> | 2008-11-08 15:27:17 (GMT) |
| commit | 3946063b550e9874c782f7cbbc18bd270b840744 (patch) | |
| tree | 2445398367bebd8dfa7e8d9e56069d24f521f73b | |
| parent | a3ee12ad6b62a4258af2b09546194def7391048d (diff) | |
| download | mxe-3946063b550e9874c782f7cbbc18bd270b840744.zip mxe-3946063b550e9874c782f7cbbc18bd270b840744.tar.gz mxe-3946063b550e9874c782f7cbbc18bd270b840744.tar.bz2 | |
improved coding style
| -rw-r--r-- | Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -11,13 +11,13 @@ SED := $(shell gsed --version >/dev/null 2>&1 && echo g)sed PKG_RULES := $(patsubst src/%.mk,%,$(wildcard src/*.mk)) include src/*.mk -ARCHIVE_CHECK = \ +CHECK_ARCHIVE = \ $(if $(filter %.tar.gz, $(1)),tar tfz '$(1)' >/dev/null 2>&1, \ $(if $(filter %.tar.bz2,$(1)),tar tfj '$(1)' >/dev/null 2>&1, \ $(if $(filter %.zip, $(1)),unzip -t '$(1)' >/dev/null 2>&1, \ $(error Unknown archive format: $(1))))) -ARCHIVE_UNPACK = \ +UNPACK_ARCHIVE = \ $(if $(filter %.tar.gz, $(1)),tar xvzf '$(1)', \ $(if $(filter %.tar.bz2,$(1)),tar xvjf '$(1)', \ $(if $(filter %.zip, $(1)),unzip '$(1)', \ @@ -38,10 +38,10 @@ $(PREFIX)/installed.$(1): $(addprefix $(PREFIX)/installed.,$($(1)_DEPS)) rm -rf '$(2)' mkdir -p '$(2)' cd '$(PKG_DIR)' && ( \ - $(call ARCHIVE_CHECK,$($(1)_FILE)) || \ + $(call CHECK_ARCHIVE,$($(1)_FILE)) || \ $(call DOWNLOAD,$($(1)_URL),$($(1)_URL_2)) ) cd '$(2)' && \ - $(call ARCHIVE_UNPACK,$(PKG_DIR)/$($(1)_FILE)) + $(call UNPACK_ARCHIVE,$(PKG_DIR)/$($(1)_FILE)) $$(call $(1)_BUILD,$(1),$(2)/$($(1)_SUBDIR)) rm -rfv '$(2)' touch '$$@' |