Mercurial > mxe-octave
diff Makefile @ 120:4edf6a519683
improved coding style
author | Volker Grabsch <vog@notjusthosting.com> |
---|---|
date | Sat, 08 Nov 2008 16:27:17 +0100 |
parents | ff34f15ec142 |
children | 15e0ab5c4df0 |
line wrap: on
line diff
--- a/Makefile Sat Nov 08 16:20:58 2008 +0100 +++ b/Makefile Sat Nov 08 16:27:17 2008 +0100 @@ -11,13 +11,13 @@ 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 @@ 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 '$$@'