aboutsummaryrefslogtreecommitdiffstats
path: root/sounds
diff options
context:
space:
mode:
authorqwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b>2006-09-25 15:24:48 +0000
committerqwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b>2006-09-25 15:24:48 +0000
commitad5734af7fc4d67fdfff2ba660afbdf7e8b270c9 (patch)
treec6ea570417ea2430c4806c33690b1160b8c78de6 /sounds
parent753779f177b8ddd41b0cbc693e9931dacf835317 (diff)
Merged revisions 43616 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r43616 | qwell | 2006-09-25 08:23:31 -0700 (Mon, 25 Sep 2006) | 4 lines One more fix for sounds installation - this time for portability. Reported to asterisk-dev mailing list. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@43617 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'sounds')
-rw-r--r--sounds/Makefile15
1 files changed, 8 insertions, 7 deletions
diff --git a/sounds/Makefile b/sounds/Makefile
index 68cfb9209..eadd35a49 100644
--- a/sounds/Makefile
+++ b/sounds/Makefile
@@ -15,6 +15,7 @@
-include $(ASTTOPDIR)/menuselect.makeopts
+PWD:=$(shell pwd)
SOUNDS_DIR:=$(DESTDIR)$(ASTDATADIR)/sounds
MOH_DIR:=$(DESTDIR)$(ASTDATADIR)/moh
CORE_SOUNDS_VERSION:=1.4.2
@@ -57,7 +58,7 @@ $(SOUNDS_DIR)/.asterisk-core-sounds-en-%:
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) - && \
+ (cd $(SOUNDS_DIR); cat $(PWD)/$${PACKAGE} | gzip -d | tar xf -) && \
touch $@
$(SOUNDS_DIR)/.asterisk-core-sounds-es-%:
@@ -65,7 +66,7 @@ $(SOUNDS_DIR)/.asterisk-core-sounds-es-%:
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 - && \
+ (cd $(SOUNDS_DIR)/es; cat $(PWD)/$${PACKAGE} | gzip -d | tar xf -) && \
touch $@
$(SOUNDS_DIR)/.asterisk-core-sounds-fr-%:
@@ -73,7 +74,7 @@ $(SOUNDS_DIR)/.asterisk-core-sounds-fr-%:
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 - && \
+ (cd $(SOUNDS_DIR)/fr; cat $(PWD)/$${PACKAGE} | gzip -d | tar xf -) && \
touch $@
$(SOUNDS_DIR)/.asterisk-extra-sounds-en-%:
@@ -81,7 +82,7 @@ $(SOUNDS_DIR)/.asterisk-extra-sounds-en-%:
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) - && \
+ (cd $(SOUNDS_DIR); cat $(PWD)/$${PACKAGE} | gzip -d | tar xf -) && \
touch $@
$(SOUNDS_DIR)/.asterisk-extra-sounds-es-%:
@@ -89,7 +90,7 @@ $(SOUNDS_DIR)/.asterisk-extra-sounds-es-%:
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 - && \
+ (cd $(SOUNDS_DIR)/es; cat $(PWD)/$${PACKAGE} | gzip -d | tar xf -) && \
touch $@
$(SOUNDS_DIR)/.asterisk-extra-sounds-fr-%:
@@ -97,14 +98,14 @@ $(SOUNDS_DIR)/.asterisk-extra-sounds-fr-%:
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 - && \
+ (cd $(SOUNDS_DIR)/fr; cat $(PWD)/$${PACKAGE} | gzip -d | tar xf -) && \
touch $@
$(MOH_DIR)/.asterisk-moh-%:
@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) - && \
+ (cd $(MOH_DIR); cat $(PWD)/$${PACKAGE} | gzip -d | tar xf -) && \
touch $@
asterisk-core-%.tar.gz: