aboutsummaryrefslogtreecommitdiffstats
path: root/sounds/Makefile
diff options
context:
space:
mode:
authorqwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-07-27 16:41:19 +0000
committerqwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-07-27 16:41:19 +0000
commit365451810c5b60069de00429317a4b6c32b78882 (patch)
tree9408698240042bc8994ec6b8dbf757d94b5ec88c /sounds/Makefile
parent1c3e15e3f8a3c608cfacde2888866dc9fe7cbce7 (diff)
Merged revisions 279850 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ................ r279850 | qwell | 2010-07-27 11:40:05 -0500 (Tue, 27 Jul 2010) | 9 lines Merged revisions 279849 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ........ r279849 | qwell | 2010-07-27 11:39:16 -0500 (Tue, 27 Jul 2010) | 1 line Simply sounds/Makefile some more. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@279851 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'sounds/Makefile')
-rw-r--r--sounds/Makefile32
1 files changed, 16 insertions, 16 deletions
diff --git a/sounds/Makefile b/sounds/Makefile
index 532e06aaf..5cd1db9b8 100644
--- a/sounds/Makefile
+++ b/sounds/Makefile
@@ -71,8 +71,8 @@ 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; \
+$(1)/.asterisk-$(2)$(if $(3),-$(3),)-%: have_download
+ $(CMD_PREFIX)PACKAGE=$$(subst $(1)/.asterisk,asterisk,$$@).tar.gz; \
if test ! -f $$$${PACKAGE}; then \
if test ! -f $$(SOUNDS_CACHE_DIR)/$$$${PACKAGE}; then \
(cd $$(SOUNDS_CACHE_DIR); \
@@ -86,8 +86,8 @@ $$($(1))/.asterisk-$(2)$(if $(3),-$(3),)-%: have_download
fi; \
$(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 $$@
+ rm -f $$(subst -$(4),,$$@)-*; \
+ (cd $(1)$(if $(3),/$(3),); cat $$(CURDIR)/$$$${PACKAGE} | gzip -d | tar xof -) && touch $$@
endef
define sound_download_rule
@@ -110,13 +110,13 @@ endef
else
define sound_format_lang_rule
-$$($(1))/.asterisk-$(2)$(if $(3),-$(3),)-%: have_download
- $(CMD_PREFIX)PACKAGE=$$(subst $$($(1))/.asterisk,asterisk,$$@).tar.gz; \
+$(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; \
- $(if $($(4)_VERSION),rm -f $$(subst -$$($(4)_VERSION),,$$@)-*,); \
- (cd $$($(1))$(if $(3),/$(3),); cat $$(CURDIR)/$$$${PACKAGE} | gzip -d | tar xof -) && touch $$@
+ rm -f $$(subst -$(4),,$$@)-*; \
+ (cd $(1)$(if $(3),/$(3),); cat $$(CURDIR)/$$$${PACKAGE} | gzip -d | tar xof -) && touch $$@
endef
define sound_download_rule
@@ -146,19 +146,19 @@ have_download:
exit 1; \
fi
-$(eval $(call sound_format_lang_rule,SOUNDS_DIR,core-sounds,en,CORE_SOUNDS))
+$(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),core-sounds,en,$(CORE_SOUNDS_VERSION)))
-$(eval $(call sound_format_lang_rule,SOUNDS_DIR,core-sounds,es,CORE_SOUNDS))
+$(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),core-sounds,es,$(CORE_SOUNDS_VERSION)))
-$(eval $(call sound_format_lang_rule,SOUNDS_DIR,core-sounds,fr,CORE_SOUNDS))
+$(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),core-sounds,fr,$(CORE_SOUNDS_VERSION)))
-$(eval $(call sound_format_lang_rule,SOUNDS_DIR,extra-sounds,en,EXTRA_SOUNDS))
+$(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),extra-sounds,en,$(EXTRA_SOUNDS_VERSION)))
-$(eval $(call sound_format_lang_rule,SOUNDS_DIR,extra-sounds,es,EXTRA_SOUNDS))
+$(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),extra-sounds,es,$(EXTRA_SOUNDS_VERSION)))
-$(eval $(call sound_format_lang_rule,SOUNDS_DIR,extra-sounds,fr,EXTRA_SOUNDS))
+$(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),extra-sounds,fr,$(EXTRA_SOUNDS_VERSION)))
-$(eval $(call sound_format_lang_rule,MOH_DIR,moh,,MOH))
+$(eval $(call sound_format_lang_rule,$(MOH_DIR),moh,,$(MOH_VERSION)))
$(eval $(call sound_download_rule,core))
@@ -172,7 +172,7 @@ dist-clean:
$(SOUNDS_DIR)/en $(MOH_DIR) $(SOUNDS_DIR)/es $(SOUNDS_DIR)/fr $(SOUNDS_CACHE_DIR):
$(INSTALL) -d $@
-install: ${SOUNDS_CACHE_DIR} $(SOUNDS_DIR)/en $(SOUNDS_DIR)/es $(SOUNDS_DIR)/fr $(MOH_DIR) $(CORE_SOUND_TAGS) $(EXTRA_SOUND_TAGS) $(MOH_TAGS)
+install: $(SOUNDS_CACHE_DIR) $(SOUNDS_DIR)/en $(SOUNDS_DIR)/es $(SOUNDS_DIR)/fr $(MOH_DIR) $(CORE_SOUND_TAGS) $(EXTRA_SOUND_TAGS) $(MOH_TAGS)
uninstall:
rm -rf $(SOUNDS_DIR)