From 1fad38124dfbfff195262f21ebf6c6269ae5dcc6 Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Fri, 11 Jul 2008 12:21:29 +0000 Subject: [PATCH] Merged revisions 129907 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r129907 | kpfleming | 2008-07-11 07:15:42 -0500 (Fri, 11 Jul 2008) | 2 lines don't attempt to set user/group ownership of extracted sound files (reported on asterisk-users) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@129916 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- sounds/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sounds/Makefile b/sounds/Makefile index 840d52e19f..398806b082 100644 --- a/sounds/Makefile +++ b/sounds/Makefile @@ -80,7 +80,7 @@ $(SOUNDS_DIR)/.asterisk-core-sounds-en-%: have_download if test ! -f $${PACKAGE}; then $(DOWNLOAD) $(WGET_ARGS) $(SOUNDS_URL)/$${PACKAGE}; fi; \ if test ! -f $${PACKAGE}; then exit 1; fi; \ rm -f $(subst -$(CORE_SOUNDS_VERSION),,$@)-* && \ - (cd $(SOUNDS_DIR)/en; cat $(CURDIR)/$${PACKAGE} | gzip -d | tar xf -) && \ + (cd $(SOUNDS_DIR)/en; cat $(CURDIR)/$${PACKAGE} | gzip -d | tar xof -) && \ touch $@ $(SOUNDS_DIR)/.asterisk-core-sounds-es-%: have_download @@ -88,7 +88,7 @@ $(SOUNDS_DIR)/.asterisk-core-sounds-es-%: have_download if test ! -f $${PACKAGE}; then $(DOWNLOAD) $(WGET_ARGS) $(SOUNDS_URL)/$${PACKAGE}; fi; \ if test ! -f $${PACKAGE}; then exit 1; fi; \ rm -f $(subst -$(CORE_SOUNDS_VERSION),,$@)-* && \ - (cd $(SOUNDS_DIR)/es; cat $(CURDIR)/$${PACKAGE} | gzip -d | tar xf -) && \ + (cd $(SOUNDS_DIR)/es; cat $(CURDIR)/$${PACKAGE} | gzip -d | tar xof -) && \ touch $@ $(SOUNDS_DIR)/.asterisk-core-sounds-fr-%: have_download @@ -96,7 +96,7 @@ $(SOUNDS_DIR)/.asterisk-core-sounds-fr-%: have_download if test ! -f $${PACKAGE}; then $(DOWNLOAD) $(WGET_ARGS) $(SOUNDS_URL)/$${PACKAGE}; fi; \ if test ! -f $${PACKAGE}; then exit 1; fi; \ rm -f $(subst -$(CORE_SOUNDS_VERSION),,$@)-* && \ - (cd $(SOUNDS_DIR)/fr; cat $(CURDIR)/$${PACKAGE} | gzip -d | tar xf -) && \ + (cd $(SOUNDS_DIR)/fr; cat $(CURDIR)/$${PACKAGE} | gzip -d | tar xof -) && \ touch $@ $(SOUNDS_DIR)/.asterisk-extra-sounds-en-%: have_download @@ -104,7 +104,7 @@ $(SOUNDS_DIR)/.asterisk-extra-sounds-en-%: have_download if test ! -f $${PACKAGE}; then $(DOWNLOAD) $(WGET_ARGS) $(SOUNDS_URL)/$${PACKAGE}; fi; \ if test ! -f $${PACKAGE}; then exit 1; fi; \ rm -f $(subst -$(EXTRA_SOUNDS_VERSION),,$@)-* && \ - (cd $(SOUNDS_DIR)/en; cat $(CURDIR)/$${PACKAGE} | gzip -d | tar xf -) && \ + (cd $(SOUNDS_DIR)/en; cat $(CURDIR)/$${PACKAGE} | gzip -d | tar xof -) && \ touch $@ $(SOUNDS_DIR)/.asterisk-extra-sounds-es-%: have_download @@ -112,7 +112,7 @@ $(SOUNDS_DIR)/.asterisk-extra-sounds-es-%: have_download if test ! -f $${PACKAGE}; then $(DOWNLOAD) $(WGET_ARGS) $(SOUNDS_URL)/$${PACKAGE}; fi; \ if test ! -f $${PACKAGE}; then exit 1; fi; \ rm -f $(subst -$(EXTRA_SOUNDS_VERSION),,$@)-* && \ - (cd $(SOUNDS_DIR)/es; cat $(CURDIR)/$${PACKAGE} | gzip -d | tar xf -) && \ + (cd $(SOUNDS_DIR)/es; cat $(CURDIR)/$${PACKAGE} | gzip -d | tar xof -) && \ touch $@ $(SOUNDS_DIR)/.asterisk-extra-sounds-fr-%: have_download @@ -120,14 +120,14 @@ $(SOUNDS_DIR)/.asterisk-extra-sounds-fr-%: have_download if test ! -f $${PACKAGE}; then $(DOWNLOAD) $(WGET_ARGS) $(SOUNDS_URL)/$${PACKAGE}; fi; \ if test ! -f $${PACKAGE}; then exit 1; fi; \ rm -f $(subst -$(EXTRA_SOUNDS_VERSION),,$@)-* && \ - (cd $(SOUNDS_DIR)/fr; cat $(CURDIR)/$${PACKAGE} | gzip -d | tar xf -) && \ + (cd $(SOUNDS_DIR)/fr; cat $(CURDIR)/$${PACKAGE} | gzip -d | tar xof -) && \ touch $@ $(MOH_DIR)/.asterisk-moh-%: have_download @PACKAGE=$(subst $(MOH_DIR)/.asterisk,asterisk,$@).tar.gz; \ if test ! -f $${PACKAGE}; then $(DOWNLOAD) $(WGET_ARGS) $(SOUNDS_URL)/$${PACKAGE}; fi; \ if test ! -f $${PACKAGE}; then exit 1; fi; \ - (cd $(MOH_DIR); cat $(CURDIR)/$${PACKAGE} | gzip -d | tar xf -) && \ + (cd $(MOH_DIR); cat $(CURDIR)/$${PACKAGE} | gzip -d | tar xof -) && \ touch $@ asterisk-core-%.tar.gz: have_download