From: Jason Parker <jparker@digium.com>
Date: Wed, 20 Sep 2006 22:29:31 +0000 (+0000)
Subject: Merged revisions 43386 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~4707
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f9214d59cd2ac533a752c7709e94315eb28b14da;p=thirdparty%2Fasterisk.git

Merged revisions 43386 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r43386 | qwell | 2006-09-20 15:27:54 -0700 (Wed, 20 Sep 2006) | 2 lines

Go back to the old(ish) way of installing sound files.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43387 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/sounds/Makefile b/sounds/Makefile
index d632e8a732..082ef83721 100644
--- a/sounds/Makefile
+++ b/sounds/Makefile
@@ -53,26 +53,60 @@ WGET_ARGS:=--continue
 
 all: $(CORE_SOUNDS) $(EXTRA_SOUNDS) $(MOH)
 
-$(SOUNDS_DIR)/.asterisk-core-sounds-en-%: asterisk-core-sounds-en-%.tar.gz $(SOUNDS_DIR)
-	cat $< | gzip -d | tar xCf $(SOUNDS_DIR) -
-
-$(SOUNDS_DIR)/.asterisk-core-sounds-fr-%: asterisk-core-sounds-fr-%.tar.gz $(SOUNDS_DIR)/fr
-	cat $< | gzip -d | tar xCf $(SOUNDS_DIR)/fr -
-
-$(SOUNDS_DIR)/.asterisk-core-sounds-es-%: asterisk-core-sounds-es-%.tar.gz $(SOUNDS_DIR)/es
-	cat $< | gzip -d | tar xCf $(SOUNDS_DIR)/es -
-
-$(SOUNDS_DIR)/.asterisk-extra-sounds-en-%: asterisk-extra-sounds-en-%.tar.gz $(SOUNDS_DIR)
-	cat $< | gzip -d | tar xCf $(SOUNDS_DIR) -
-
-$(SOUNDS_DIR)/.asterisk-extra-sounds-fr-%: asterisk-extra-sounds-fr-%.tar.gz $(SOUNDS_DIR)/fr
-	cat $< | gzip -d | tar xCf $(SOUNDS_DIR)/fr -
-
-$(SOUNDS_DIR)/.asterisk-extra-sounds-es-%: asterisk-extra-sounds-es-%.tar.gz $(SOUNDS_DIR)/es
-	cat $< | gzip -d | tar xCf $(SOUNDS_DIR)/es -
-
-$(MOH_DIR)/.asterisk-moh-%: asterisk-moh-%.tar.gz $(MOH_DIR)
-	cat $< | gzip -d | tar xCf $(MOH_DIR) -
+$(SOUNDS_DIR)/.asterisk-core-sounds-en-%: $(SOUNDS_DIR)
+	@PACKAGE=$(subst $(SOUNDS_DIR)/.asterisk,asterisk,$@).tar.gz; \
+	if test ! -f $${PACKAGE}; then wget $(WGET_ARGS) $(SOUNDS_URL)/$${PACKAGE}; fi; \
+	if test ! -f $${PACKAGE}; then exit 1; fi; \
+	rm -f $(subst -$(CORE_SOUNDS_VERSION),,$@)-* && \
+	cat $${PACKAGE} | gzip -d | tar xCf $(SOUNDS_DIR) -
+	touch $@
+
+$(SOUNDS_DIR)/.asterisk-core-sounds-es-%: $(SOUNDS_DIR)/es
+	@PACKAGE=$(subst $(SOUNDS_DIR)/.asterisk,asterisk,$@).tar.gz; \
+	if test ! -f $${PACKAGE}; then wget $(WGET_ARGS) $(SOUNDS_URL)/$${PACKAGE}; fi; \
+	if test ! -f $${PACKAGE}; then exit 1; fi; \
+	rm -f $(subst -$(CORE_SOUNDS_VERSION),,$@)-* && \
+	cat $${PACKAGE} | gzip -d | tar xCf $(SOUNDS_DIR)/es -
+	touch $@
+
+$(SOUNDS_DIR)/.asterisk-core-sounds-fr-%: $(SOUNDS_DIR)/fr
+	@PACKAGE=$(subst $(SOUNDS_DIR)/.asterisk,asterisk,$@).tar.gz; \
+	if test ! -f $${PACKAGE}; then wget $(WGET_ARGS) $(SOUNDS_URL)/$${PACKAGE}; fi; \
+	if test ! -f $${PACKAGE}; then exit 1; fi; \
+	rm -f $(subst -$(CORE_SOUNDS_VERSION),,$@)-* && \
+	cat $${PACKAGE} | gzip -d | tar xCf $(SOUNDS_DIR)/fr -
+	touch $@
+
+$(SOUNDS_DIR)/.asterisk-extra-sounds-en-%: $(SOUNDS_DIR)
+	@PACKAGE=$(subst $(SOUNDS_DIR)/.asterisk,asterisk,$@).tar.gz; \
+	if test ! -f $${PACKAGE}; then wget $(WGET_ARGS) $(SOUNDS_URL)/$${PACKAGE}; fi; \
+	if test ! -f $${PACKAGE}; then exit 1; fi; \
+	rm -f $(subst -$(EXTRA_SOUNDS_VERSION),,$@)-* && \
+	cat $${PACKAGE} | gzip -d | tar xCf $(SOUNDS_DIR) -
+	touch $@
+
+$(SOUNDS_DIR)/.asterisk-extra-sounds-es-%: $(SOUNDS_DIR)/es
+	@PACKAGE=$(subst $(SOUNDS_DIR)/.asterisk,asterisk,$@).tar.gz; \
+	if test ! -f $${PACKAGE}; then wget $(WGET_ARGS) $(SOUNDS_URL)/$${PACKAGE}; fi; \
+	if test ! -f $${PACKAGE}; then exit 1; fi; \
+	rm -f $(subst -$(EXTRA_SOUNDS_VERSION),,$@)-* && \
+	cat /$${PACKAGE} | gzip -d | tar xCf $(SOUNDS_DIR)/es -
+	touch $@
+
+$(SOUNDS_DIR)/.asterisk-extra-sounds-fr-%: $(SOUNDS_DIR)/fr
+	@PACKAGE=$(subst $(SOUNDS_DIR)/.asterisk,asterisk,$@).tar.gz; \
+	if test ! -f $${PACKAGE}; then wget $(WGET_ARGS) $(SOUNDS_URL)/$${PACKAGE}; fi; \
+	if test ! -f $${PACKAGE}; then exit 1; fi; \
+	rm -f $(subst -$(EXTRA_SOUNDS_VERSION),,$@)-* && \
+	cat $${PACKAGE} | gzip -d | tar xCf $(SOUNDS_DIR)/fr -
+	touch $@
+
+$(MOH_DIR)/.asterisk-moh-%: $(MOH_DIR)
+	@PACKAGE=$(subst $(MOH_DIR)/.asterisk,asterisk,$@).tar.gz; \
+	if test ! -f $${PACKAGE}; then wget $(WGET_ARGS) $(SOUNDS_URL)/$${PACKAGE}; fi; \
+	if test ! -f $${PACKAGE}; then exit 1; fi; \
+	cat $${PACKAGE} | gzip -d | tar xCf $(MOH_DIR) -
+	touch $@
 
 asterisk-core-%.tar.gz:
 	@wget $(WGET_ARGS) $(SOUNDS_URL)/$@