diff options
author | Jason Parker <jparker@digium.com> | 2011-08-25 15:30:46 +0000 |
---|---|---|
committer | Jason Parker <jparker@digium.com> | 2011-08-25 15:30:46 +0000 |
commit | 00a8f14fb1d794a5379ca35f5328266489343adf (patch) | |
tree | ae6568849442a3c5f5d9ad58c58be16703cc8395 /sounds | |
parent | 590391c03846e7bed6d2ade8cefbecd92577c25b (diff) |
Merged revisions 333203 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10
................
r333203 | qwell | 2011-08-25 10:29:56 -0500 (Thu, 25 Aug 2011) | 15 lines
Merged revisions 333201 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r333201 | qwell | 2011-08-25 10:27:06 -0500 (Thu, 25 Aug 2011) | 8 lines
Fix installation into directories containing spaces.
This also vastly simplifies the logic in sounds/Makefile
(Closes issue ASTERISK-18290)
Reported by: Paul Belanger
Review: https://reviewboard.asterisk.org/r/1379/
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@333204 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'sounds')
-rw-r--r-- | sounds/Makefile | 116 |
1 files changed, 45 insertions, 71 deletions
diff --git a/sounds/Makefile b/sounds/Makefile index ccdd4ca6f..7238c45a2 100644 --- a/sounds/Makefile +++ b/sounds/Makefile @@ -16,9 +16,9 @@ -include $(ASTTOPDIR)/menuselect.makeopts $(ASTTOPDIR)/makeopts CMD_PREFIX?=@ -SOUNDS_DIR:=$(MAKE_ASTDATADIR)/sounds +SOUNDS_DIR:=$(DESTDIR)$(ASTDATADIR)/sounds SOUNDS_CACHE_DIR?= -MOH_DIR:=$(MAKE_ASTDATADIR)/moh +MOH_DIR:=$(DESTDIR)$(ASTDATADIR)/moh CORE_SOUNDS_VERSION:=1.4.21 EXTRA_SOUNDS_VERSION:=1.4.11 MOH_VERSION:=2.03 @@ -38,7 +38,7 @@ MCS:=$(subst -SLN16,-sln16,$(MCS)) MCS:=$(subst -SIREN7,-siren7,$(MCS)) MCS:=$(subst -SIREN14,-siren14,$(MCS)) CORE_SOUNDS:=$(MCS:CORE-SOUNDS-%=asterisk-core-sounds-%-$(CORE_SOUNDS_VERSION).tar.gz) -CORE_SOUND_TAGS:=$(MCS:CORE-SOUNDS-%=$(SOUNDS_DIR)/.asterisk-core-sounds-%-$(CORE_SOUNDS_VERSION)) +CORE_SOUND_TAGS:=$(MCS:CORE-SOUNDS-%=.asterisk-core-sounds-%-$(CORE_SOUNDS_VERSION)) MES:=$(subst -EN-,-en-,$(MENUSELECT_EXTRA_SOUNDS)) MES:=$(subst -FR-,-fr-,$(MES)) MES:=$(subst -ES-,-es-,$(MES)) @@ -52,7 +52,7 @@ MES:=$(subst -SLN16,-sln16,$(MES)) MES:=$(subst -SIREN7,-siren7,$(MES)) MES:=$(subst -SIREN14,-siren14,$(MES)) EXTRA_SOUNDS:=$(MES:EXTRA-SOUNDS-%=asterisk-extra-sounds-%-$(EXTRA_SOUNDS_VERSION).tar.gz) -EXTRA_SOUND_TAGS:=$(MES:EXTRA-SOUNDS-%=$(SOUNDS_DIR)/.asterisk-extra-sounds-%-$(EXTRA_SOUNDS_VERSION)) +EXTRA_SOUND_TAGS:=$(MES:EXTRA-SOUNDS-%=.asterisk-extra-sounds-%-$(EXTRA_SOUNDS_VERSION)) MM:=$(subst -OPSOUND-,-opsound-,$(MENUSELECT_MOH)) MM:=$(subst -WAV,-wav,$(MM)) MM:=$(subst -ULAW,-ulaw,$(MM)) @@ -64,76 +64,59 @@ MM:=$(subst -SLN16,-sln16,$(MM)) MM:=$(subst -SIREN7,-siren7,$(MM)) MM:=$(subst -SIREN14,-siren14,$(MM)) MOH:=$(MM:MOH-%=asterisk-moh-%-$(MOH_VERSION).tar.gz) -MOH_TAGS:=$(MM:MOH-%=$(MOH_DIR)/.asterisk-moh-%-$(MOH_VERSION)) +MOH_TAGS:=$(MM:MOH-%=.asterisk-moh-%-$(MOH_VERSION)) # If "fetch" is used, --continue is not a valid option. ifneq ($(findstring wget,$(DOWNLOAD)),) DOWNLOAD+=--continue $(WGET_EXTRA_ARGS) endif -ifneq ($(SOUNDS_CACHE_DIR),) define sound_format_lang_rule -$(1)/.asterisk-$(2)$(if $(3),-$(3),)-%: have_download - $(CMD_PREFIX)PACKAGE=$$(subst $(1)/.asterisk,asterisk,$$@).tar.gz; \ - if test ! -f $$(SOUNDS_CACHE_DIR)/$$$${PACKAGE}; then \ - (cd $$(SOUNDS_CACHE_DIR); $$(DOWNLOAD) $$(SOUNDS_URL)/$$$${PACKAGE}); \ - fi; \ - if test ! -f $$(SOUNDS_CACHE_DIR)/$$$${PACKAGE}.sha1; then \ - (cd $$(SOUNDS_CACHE_DIR); $$(DOWNLOAD) $$(SOUNDS_URL)/$$$${PACKAGE}.sha1); \ - fi; \ - $(LN) -sf $$(SOUNDS_CACHE_DIR)/$$$${PACKAGE} .; \ - $(LN) -sf $$(SOUNDS_CACHE_DIR)/$$$${PACKAGE}.sha1 .; \ - $$(SHA1SUM) -c --status $$$${PACKAGE}.sha1 || \ - ( \ - rm -f $$(SOUNDS_CACHE_DIR)/$$$${PACKAGE} $$(SOUNDS_CACHE_DIR)/$$$${PACKAGE}.sha1 $$$${PACKAGE} $$$${PACKAGE}.sha1; \ - echo "Bad checksum: $$$${PACKAGE}" 1>&2; \ - exit 1; \ - ) || exit 1; \ - rm -f $$(subst -$(4),,$$@)-*; \ - (cd $(1)$(if $(3),/$(3),); cat $$(CURDIR)/$$$${PACKAGE} | gzip -d | tar xof -) && touch $$@ -endef - -define sound_download_rule -asterisk-$(1)-%.tar.gz: have_download +.PHONY: .asterisk-$(2)$(if $(3),-$(3),)-% + +.asterisk-$(2)$(if $(3),-$(3),)-%: asterisk-$(2)$(if $(3),-$(3),)-%.tar.gz $(CMD_PREFIX) \ - if test ! -f $$(SOUNDS_CACHE_DIR)/$$@; then \ - (cd $$(SOUNDS_CACHE_DIR); $$(DOWNLOAD) $$(SOUNDS_URL)/$$@); \ - fi; \ - if test ! -f $$(SOUNDS_CACHE_DIR)/$$@.sha1; then \ - (cd $$(SOUNDS_CACHE_DIR); $$(DOWNLOAD) $$(SOUNDS_URL)/$$@.sha1); \ - fi; \ - $(LN) -sf $$(SOUNDS_CACHE_DIR)/$$@ .; \ - $(LN) -sf $$(SOUNDS_CACHE_DIR)/$$@.sha1 .; \ - $$(SHA1SUM) -c --status $$@.sha1 || \ + if test ! -f "$(1)$(if $(3),/$(3),)/$$@"; then \ + PACKAGE=$$(subst .asterisk,asterisk,$$@).tar.gz; \ ( \ - rm -f $$(SOUNDS_CACHE_DIR)/$$@ $$(SOUNDS_CACHE_DIR)/$$@.sha1 $$@ $$@.sha1; \ - echo "Bad checksum: $$@" 1>&2; \ - exit 1; \ - ) || exit 1 -endef + mkdir -p "$(1)$(if $(3),/$(3),)"; \ + cd "$(1)$(if $(3),/$(3),)"; \ + rm -f $$(subst -$(4),,$$@)-*; \ + cat $$(CURDIR)/$$$${PACKAGE} | gzip -d | tar xof - \ + ) && touch "$(1)$(if $(3),/$(3),)/$$@"; \ + fi +asterisk-$(2)$(if $(3),-$(3),)-%.tar.gz: have_download +ifneq ($(SOUNDS_CACHE_DIR),) + $(CMD_PREFIX) \ + if test ! -f "$(1)$(if $(3),/$(3),)/.$$(subst .tar.gz,,$$@)"; then \ + if test ! -d "$$(SOUNDS_CACHE_DIR)/"; then \ + mkdir -p "$$(SOUNDS_CACHE_DIR)/"; \ + fi; \ + if test ! -f "$$(SOUNDS_CACHE_DIR)/$$@"; then \ + (cd "$$(SOUNDS_CACHE_DIR)"; $$(DOWNLOAD) $$(SOUNDS_URL)/$$@); \ + fi; \ + if test ! -f "$$(SOUNDS_CACHE_DIR)/$$@.sha1"; then \ + (cd "$$(SOUNDS_CACHE_DIR)"; $$(DOWNLOAD) $$(SOUNDS_URL)/$$@.sha1); \ + fi; \ + $$(LN) -sf "$$(SOUNDS_CACHE_DIR)/$$@" .; \ + $$(LN) -sf "$$(SOUNDS_CACHE_DIR)/$$@.sha1" .; \ + $$(SHA1SUM) -c --status $$@.sha1 || \ + ( \ + rm -f "$$(SOUNDS_CACHE_DIR)/$$@" "$$(SOUNDS_CACHE_DIR)/$$@.sha1" $$@ $$@.sha1; \ + echo "Bad checksum: $$@" 1>&2; \ + exit 1; \ + ) || exit 1; \ + fi else - -define sound_format_lang_rule -$(1)/.asterisk-$(2)$(if $(3),-$(3),)-%: have_download - $(CMD_PREFIX)PACKAGE=$$(subst $(1)/.asterisk,asterisk,$$@).tar.gz; \ - if test ! -f $$$${PACKAGE}; then \ - $$(DOWNLOAD) $$(SOUNDS_URL)/$$$${PACKAGE} || exit 1; \ - fi; \ - rm -f $$(subst -$(4),,$$@)-*; \ - (cd $(1)$(if $(3),/$(3),); cat $$(CURDIR)/$$$${PACKAGE} | gzip -d | tar xof -) && touch $$@ -endef - -define sound_download_rule -asterisk-$(1)-%.tar.gz: have_download - $(CMD_PREFIX)if test ! -f $$@ && test ! -f $$(SOUNDS_DIR)/.$$(subst .tar.gz,,$$@); then \ + $(CMD_PREFIX) \ + if test ! -f $$@ && test ! -f "$(1)$(if $(3),/$(3),)/.$$(subst .tar.gz,,$$@)"; then \ $$(DOWNLOAD) $$(SOUNDS_URL)/$$@; \ fi -endef - endif +endef # sound_format_lang_rule -all: $(SOUNDS_CACHE_DIR) $(CORE_SOUNDS) $(EXTRA_SOUNDS) $(MOH) +all: $(CORE_SOUNDS) $(EXTRA_SOUNDS) $(MOH) have_download: @if test "$(DOWNLOAD)" = ":" ; then \ @@ -169,23 +152,14 @@ $(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),extra-sounds,fr,$(EXTRA_SOUND $(eval $(call sound_format_lang_rule,$(MOH_DIR),moh,,$(MOH_VERSION))) -$(eval $(call sound_download_rule,core-sounds)) - -$(eval $(call sound_download_rule,extra-sounds)) - -$(eval $(call sound_download_rule,moh)) - dist-clean: rm -f *.tar.gz -$(SOUNDS_DIR)/en $(MOH_DIR) $(SOUNDS_DIR)/en_AU $(SOUNDS_DIR)/es $(SOUNDS_DIR)/fr $(SOUNDS_DIR)/ru $(SOUNDS_CACHE_DIR): - mkdir -p $@ - -install: $(SOUNDS_CACHE_DIR) $(SOUNDS_DIR)/en $(SOUNDS_DIR)/en_AU $(SOUNDS_DIR)/es $(SOUNDS_DIR)/fr $(MOH_DIR) $(CORE_SOUND_TAGS) $(EXTRA_SOUND_TAGS) $(MOH_TAGS) +install: $(CORE_SOUND_TAGS) $(EXTRA_SOUND_TAGS) $(MOH_TAGS) uninstall: - rm -rf $(SOUNDS_DIR) - rm -rf $(MOH_DIR) + rm -rf "$(SOUNDS_DIR)" + rm -rf "$(MOH_DIR)" core_sounds_version: @echo $(CORE_SOUNDS_VERSION) |