kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-15 22:38:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge equiv of revision 279657 to solve sounds/Makefile issue

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/1.6.2.11-rc2@279686 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jason Parker
2010-07-26 23:24:57 +00:00
parent 9e57a35594
commit 48ccd76493
1 changed files with 36 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
sounds/Makefile
View File

@@ -75,30 +75,38 @@ ifneq ($(SOUNDS_CACHE_DIR),)
define sound_format_lang_rule define sound_format_lang_rule
$$($(1))/.asterisk-$(2)$(if $(3),-$(3),)-%: have_download $$($(1))/.asterisk-$(2)$(if $(3),-$(3),)-%: have_download
$(CMD_PREFIX)PACKAGE=$$(subst $$($(1))/.asterisk,asterisk,$$@).tar.gz; $(BS) $(CMD_PREFIX)PACKAGE=$$(subst $$($(1))/.asterisk,asterisk,$$@).tar.gz; \
if test ! -f $$$${PACKAGE}; then $(BS) if test ! -f $$$${PACKAGE}; then \
if test ! -f $$(SOUNDS_CACHE_DIR)/$$$${PACKAGE}; then $(BS) if test ! -f $$(SOUNDS_CACHE_DIR)/$$$${PACKAGE}; then \
(cd $$(SOUNDS_CACHE_DIR); ($$(DOWNLOAD) $$(WGET_ARGS) $$(SOUNDS_URL)/$$$${PACKAGE} $$(SOUNDS_URL)/$$$${PACKAGE}.sha1 $(BS) (cd $$(SOUNDS_CACHE_DIR); \
&& sha1sum -c --status $$$${PACKAGE}.sha1) || $(BS) ( \
(echo "Bad checksum: $$$${PACKAGE}" 1>&2; exit 1)); $(BS) $$(DOWNLOAD) $$(WGET_ARGS) $$(SOUNDS_URL)/$$$${PACKAGE} && \
fi; $(BS) $$(DOWNLOAD) $$(WGET_ARGS) $$(SOUNDS_URL)/$$$${PACKAGE}.sha1 && \
$(LN) -sf $$(SOUNDS_CACHE_DIR)/$$$${PACKAGE} .; $(BS) $$(SHA1SUM) -c --status $$$${PACKAGE}.sha1 \
fi; $(BS) ) || \
$(if $($(4)_VERSION),\ (echo "Bad checksum: $$$${PACKAGE}" 1>&2; exit 1) \
$(EMPTY) rm -f $$(subst -$$($(4)_VERSION),,$$@)-* && $(BS) ); \
,) (cd $$($(1))$(if $(3),/$(3),); cat $$(CURDIR)/$$$${PACKAGE} | gzip -d | tar xof -) && $(BS) fi; \
touch $$@ $(LN) -sf $$(SOUNDS_CACHE_DIR)/$$$${PACKAGE} .; \
fi; \
$(if $($(4)_VERSION),rm -f $$(subst -$$($(4)_VERSION),,$$@)-*,); \
(cd $$($(1))$(if $(3),/$(3),); cat $$(CURDIR)/$$$${PACKAGE} | gzip -d | tar xof -) && touch $$@
endef endef
define sound_download_rule define sound_download_rule
asterisk-$(1)-%.tar.gz: have_download asterisk-$(1)-%.tar.gz: have_download
$(CMD_PREFIX)if test ! -f $$@ && test ! -f $$(SOUNDS_DIR)/.$$(subst .tar.gz,,$/$@); then $(BS) $(CMD_PREFIX)if test ! -f $$@ && test ! -f $$(SOUNDS_DIR)/.$$(subst .tar.gz,,$/$@); then \
if test ! -f $$(SOUNDS_CACHE_DIR)/$$@; then $(BS) if test ! -f $$(SOUNDS_CACHE_DIR)/$$@; then \
(cd $$(SOUNDS_CACHE_DIR); ($$(DOWNLOAD) $$(WGET_ARGS) $$(SOUNDS_URL)/$$@ $$(SOUNDS_URL)/$$@.sha1 $(BS) (cd $$(SOUNDS_CACHE_DIR); \
&& sha1sum -c --status $$@.sha1) || $(BS) ( \
(echo "Bad checksum: $$@" 1>&2; exit 1)); $(BS) $$(DOWNLOAD) $$(WGET_ARGS) $$(SOUNDS_URL)/$$@ && \
fi; $(BS) $$(DOWNLOAD) $$(WGET_ARGS) $$(SOUNDS_URL)/$$@.sha1 && \
$(LN) -sf $$(SOUNDS_CACHE_DIR)/$$@ .; $(BS) $$(SHA1SUM) -c --status $$@.sha1 \
) || \
(echo "Bad checksum: $$@" 1>&2; exit 1) \
); \
fi; \
$(LN) -sf $$(SOUNDS_CACHE_DIR)/$$@ .; \
fi fi
endef endef
@@ -106,20 +114,18 @@ else
define sound_format_lang_rule define sound_format_lang_rule
$$($(1))/.asterisk-$(2)$(if $(3),-$(3),)-%: have_download $$($(1))/.asterisk-$(2)$(if $(3),-$(3),)-%: have_download
$(CMD_PREFIX)PACKAGE=$$(subst $$($(1))/.asterisk,asterisk,$$@).tar.gz; $(BS) $(CMD_PREFIX)PACKAGE=$$(subst $$($(1))/.asterisk,asterisk,$$@).tar.gz; \
if test ! -f $$$${PACKAGE}; then $(BS) if test ! -f $$$${PACKAGE}; then \
($$(DOWNLOAD) $$(WGET_ARGS) $$(SOUNDS_URL)/$$$${PACKAGE} || exit 1); $(BS) ($$(DOWNLOAD) $$(WGET_ARGS) $$(SOUNDS_URL)/$$$${PACKAGE} || exit 1); \
fi; $(BS) fi; \
$(if $($(4)_VERSION),\ $(if $($(4)_VERSION),rm -f $$(subst -$$($(4)_VERSION),,$$@)-*,); \
$(EMPTY) rm -f $$(subst -$$($(4)_VERSION),,$$@)-* && $(BS) (cd $$($(1))$(if $(3),/$(3),); cat $$(CURDIR)/$$$${PACKAGE} | gzip -d | tar xof -) && touch $$@
,) (cd $$($(1))$(if $(3),/$(3),); cat $$(CURDIR)/$$$${PACKAGE} | gzip -d | tar xof -) && $(BS)
touch $$@
endef endef
define sound_download_rule define sound_download_rule
asterisk-$(1)-%.tar.gz: have_download asterisk-$(1)-%.tar.gz: have_download
$(CMD_PREFIX)if test ! -f $$@ && test ! -f $$(SOUNDS_DIR)/.$$(subst .tar.gz,,$$@); then $(BS) $(CMD_PREFIX)if test ! -f $$@ && test ! -f $$(SOUNDS_DIR)/.$$(subst .tar.gz,,$$@); then \
$$(DOWNLOAD) $$(WGET_ARGS) $$(SOUNDS_URL)/$$@; $(BS) $$(DOWNLOAD) $$(WGET_ARGS) $$(SOUNDS_URL)/$$@; \
fi fi
endef endef