[asterisk-commits] qwell: tag 1.8.6.0-rc3 r333273 - in /tags/1.8.6.0-rc3: ./ build_tools/ sounds/
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Thu Aug 25 14:08:08 CDT 2011
Author: qwell
Date: Thu Aug 25 14:08:04 2011
New Revision: 333273
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=333273
Log:
Update ChangeLog, .version, merge r333201,333267.
Modified:
tags/1.8.6.0-rc3/.version
tags/1.8.6.0-rc3/ChangeLog
tags/1.8.6.0-rc3/Makefile
tags/1.8.6.0-rc3/build_tools/mkpkgconfig
tags/1.8.6.0-rc3/configure
tags/1.8.6.0-rc3/configure.ac
tags/1.8.6.0-rc3/makeopts.in
tags/1.8.6.0-rc3/sounds/Makefile
Modified: tags/1.8.6.0-rc3/.version
URL: http://svnview.digium.com/svn/asterisk/tags/1.8.6.0-rc3/.version?view=diff&rev=333273&r1=333272&r2=333273
==============================================================================
--- tags/1.8.6.0-rc3/.version (original)
+++ tags/1.8.6.0-rc3/.version Thu Aug 25 14:08:04 2011
@@ -1,1 +1,1 @@
-1.8.6.0-rc2
+1.8.6.0-rc3
Modified: tags/1.8.6.0-rc3/ChangeLog
URL: http://svnview.digium.com/svn/asterisk/tags/1.8.6.0-rc3/ChangeLog?view=diff&rev=333273&r1=333272&r2=333273
==============================================================================
--- tags/1.8.6.0-rc3/ChangeLog (original)
+++ tags/1.8.6.0-rc3/ChangeLog Thu Aug 25 14:08:04 2011
@@ -1,3 +1,19 @@
+2011-08-25 Asterisk Development Team <asteriskteam at digium.com>
+
+ * Asterisk 1.8.6.0-rc3 Released.
+
+ ------------------------------------------------------------------------
+ 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/
+ ------------------------------------------------------------------------
+
2011-08-22 Asterisk Development Team <asteriskteam at digium.com>
* Asterisk 1.8.6.0-rc2 Released.
Modified: tags/1.8.6.0-rc3/Makefile
URL: http://svnview.digium.com/svn/asterisk/tags/1.8.6.0-rc3/Makefile?view=diff&rev=333273&r1=333272&r2=333273
==============================================================================
--- tags/1.8.6.0-rc3/Makefile (original)
+++ tags/1.8.6.0-rc3/Makefile Thu Aug 25 14:08:04 2011
@@ -541,6 +541,7 @@
$(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/keys"
$(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/phoneprov"
$(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/static-http"
+ $(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/sounds"
$(INSTALL) -d "$(DESTDIR)$(ASTMANDIR)/man8"
$(INSTALL) -d "$(DESTDIR)$(AGI_DIR)"
$(INSTALL) -d "$(DESTDIR)$(ASTDBDIR)"
@@ -603,17 +604,7 @@
@exit 1
endif
-preinstall_spaces:
-ifneq ($(MAKE_PREINSTALL),)
- $(MAKE_PREINSTALL)
-endif
-
-postinstall_spaces:
-ifneq ($(MAKE_POSTINSTALL),)
- $(MAKE_POSTINSTALL)
-endif
-
-install: preinstall_spaces badshell bininstall datafiles postinstall_spaces
+install: badshell bininstall datafiles
@if [ -x /usr/sbin/asterisk-post-install ]; then \
/usr/sbin/asterisk-post-install "$(DESTDIR)" . ; \
fi
@@ -650,32 +641,32 @@
$(INSTALL) -d "$(DESTDIR)$(ASTETCDIR)"
@for x in configs/*.adsi; do \
dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`" ; \
- if [ -f $${dst} ] ; then \
+ if [ -f "$${dst}" ] ; then \
echo "Overwriting $$x" ; \
else \
echo "Installing $$x" ; \
fi ; \
- $(INSTALL) -m 644 $$x "$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`" ; \
+ $(INSTALL) -m 644 "$$x" "$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`" ; \
done
samples: adsi
@echo Installing other config files...
@for x in configs/*.sample; do \
dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`" ; \
- if [ -f $${dst} ]; then \
+ if [ -f "$${dst}" ]; then \
if [ "$(OVERWRITE)" = "y" ]; then \
- if cmp -s $${dst} $$x ; then \
+ if cmp -s "$${dst}" "$$x" ; then \
echo "Config file $$x is unchanged"; \
continue; \
fi ; \
- mv -f $${dst} $${dst}.old ; \
+ mv -f "$${dst}" "$${dst}.old" ; \
else \
echo "Skipping config file $$x"; \
continue; \
fi ;\
fi ; \
echo "Installing file $$x"; \
- $(INSTALL) -m 644 $$x $${dst} ;\
+ $(INSTALL) -m 644 "$$x" "$${dst}" ;\
done
if [ "$(OVERWRITE)" = "y" ]; then \
echo "Updating asterisk.conf" ; \
@@ -851,7 +842,7 @@
rm -f "$(DESTDIR)$(ASTMANDIR)/man8/safe_asterisk.8"
$(MAKE) -C sounds uninstall
-uninstall: preinstall_spaces _uninstall postinstall_spaces
+uninstall: _uninstall
@echo " +--------- Asterisk Uninstall Complete -----+"
@echo " + Asterisk binaries, sounds, man pages, +"
@echo " + headers, modules, and firmware builds, +"
Modified: tags/1.8.6.0-rc3/build_tools/mkpkgconfig
URL: http://svnview.digium.com/svn/asterisk/tags/1.8.6.0-rc3/build_tools/mkpkgconfig?view=diff&rev=333273&r1=333272&r2=333273
==============================================================================
--- tags/1.8.6.0-rc3/build_tools/mkpkgconfig (original)
+++ tags/1.8.6.0-rc3/build_tools/mkpkgconfig Thu Aug 25 14:08:04 2011
@@ -1,5 +1,5 @@
#!/bin/sh
-PPATH=$1
+PPATH="$1"
## Make sure we were called from Makefile
if [ "x$ASTERISKVERSIONNUM" = "x" ]; then
@@ -9,7 +9,7 @@
## Create a pkgconfig spec file for 3rd party modules (pkg-config asterisk --cflags)
-if [ ! -d $PPATH ]; then
+if [ ! -d "$PPATH" ]; then
exit
fi
@@ -29,7 +29,7 @@
${EXTREGEX} 's/-DAST(ETCDIR|LIBDIR|VARLIBDIR|VARRUNDIR|SPOOLDIR|LOGDIR|CONFPATH|MODDIR|AGIDIR)=\S* //g'`
-cat <<EOF > $PPATH/asterisk.pc
+cat <<EOF > "$PPATH/asterisk.pc"
install_prefix=$INSTALL_PREFIX
version_number=$ASTERISKVERSIONNUM
etcdir=$ASTETCDIR
Modified: tags/1.8.6.0-rc3/configure.ac
URL: http://svnview.digium.com/svn/asterisk/tags/1.8.6.0-rc3/configure.ac?view=diff&rev=333273&r1=333272&r2=333273
==============================================================================
--- tags/1.8.6.0-rc3/configure.ac (original)
+++ tags/1.8.6.0-rc3/configure.ac Thu Aug 25 14:08:04 2011
@@ -129,78 +129,6 @@
fi
fi
-# $HOME is preferred as our substitute path, unless $HOME contains a space
-for i in ${HOME} /tmp; do
- if test "${i}" = ""; then continue; fi
- if test "${i}" = "/"; then continue; fi
- __ac_path_has_spaces=`echo $HOME | grep ' '`
- if test "$ac_path_has_spaces" = ""; then :; else continue; fi
- __ac_substitute_path=${i}
- break
-done
-
-AC_PROG_LN_S
-__sub_ordinal=1
-MAKE_PREINSTALL=""
-MAKE_POSTINSTALL=""
-
-# It may initially seem a trifle bit excessive to evaluate all of these paths.
-# However, consider that many of these may invoke another variable, such as
-# ${prefix}, by default, which is not resolved until compile time. If that
-# variable contains a space, then each of the dependent variables will also
-# contain a space and thus will need the special treatment.
-for stdpath in prefix exec_prefix datarootdir datadir includedir infodir libdir libexecdir localstatedir mandir sbindir sharedstatedir sysconfdir astetcdir astsbindir astlibdir astheaderdir astmandir astvarlibdir astspooldir astlogdir astvarrundir astdatadir astdbdir astkeydir; do
- eval "__ac_path_sub=\${$stdpath}"
- #echo "__ac_path_sub=$__ac_path_sub"
- __ac_path_has_var=`sh -c "echo '$__ac_path_sub' | grep '{'"`
- if test "$__ac_path_has_var" = ""; then :; else
- __ac_path_sub=`echo $__ac_path_sub | sed 's/{/{MAKE_/'`
- fi
-
- __ac_path_has_spaces=`sh -c "echo '$__ac_path_sub' | grep ' '"`
- if test "$__ac_path_has_spaces" = ""; then
- eval "MAKE_$stdpath=\$__ac_path_sub"
- else
- # Substitute path for a path without a space
- eval "MAKE_$stdpath=\"$__ac_substitute_path/.asterisk_install_path_${__sub_ordinal}\""
- MAKE_POSTINSTALL="${MAKE_POSTINSTALL} rm -f \"$__ac_substitute_path/.asterisk_install_path_${__sub_ordinal}\";"
- MAKE_PREINSTALL="${MAKE_PREINSTALL} rm -f \"$__ac_substitute_path/.asterisk_install_path_${__sub_ordinal}\";"
- MAKE_PREINSTALL="${MAKE_PREINSTALL} ${LN_S} -f \"\$(DESTDIR)$__ac_path_sub\" \"$__ac_substitute_path/.asterisk_install_path_${__sub_ordinal}\";"
- __sub_ordinal=$((${__sub_ordinal}+1))
- fi
-done
-AC_SUBST(MAKE_PREINSTALL)
-AC_SUBST(MAKE_POSTINSTALL)
-AC_SUBST(MAKE_prefix)
-AC_SUBST(MAKE_exec_prefix)
-AC_SUBST(MAKE_datarootdir)
-AC_SUBST(MAKE_datadir)
-AC_SUBST(MAKE_includedir)
-AC_SUBST(MAKE_infodir)
-AC_SUBST(MAKE_libdir)
-AC_SUBST(MAKE_libexecdir)
-AC_SUBST(MAKE_localstatedir)
-AC_SUBST(MAKE_mandir)
-AC_SUBST(MAKE_sbindir)
-AC_SUBST(MAKE_sharedstatedir)
-AC_SUBST(MAKE_sysconfdir)
-AC_SUBST(MAKE_astetcdir)
-AC_SUBST(MAKE_astsbindir)
-AC_SUBST(MAKE_astlibdir)
-AC_SUBST(MAKE_astheaderdir)
-AC_SUBST(MAKE_astmandir)
-AC_SUBST(MAKE_astvarlibdir)
-AC_SUBST(MAKE_astspooldir)
-AC_SUBST(MAKE_astlogdir)
-AC_SUBST(MAKE_astvarrundir)
-AC_SUBST(MAKE_astdatadir)
-AC_SUBST(MAKE_astdbdir)
-AC_SUBST(MAKE_astkeydir)
-
-test "x$MAKE_prefix" = xNONE && MAKE_prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$MAKE_exec_prefix" = xNONE && MAKE_exec_prefix='${prefix}'
-
BUILD_PLATFORM=${build}
BUILD_CPU=${build_cpu}
BUILD_VENDOR=${build_vendor}
@@ -293,6 +221,7 @@
AST_PROG_LD # note, does not work on FreeBSD
AC_PROG_AWK
AC_PROG_INSTALL
+AC_PROG_LN_S
AC_PROG_RANLIB
AST_CHECK_GNU_MAKE
AC_PROG_EGREP
Modified: tags/1.8.6.0-rc3/makeopts.in
URL: http://svnview.digium.com/svn/asterisk/tags/1.8.6.0-rc3/makeopts.in?view=diff&rev=333273&r1=333272&r2=333273
==============================================================================
--- tags/1.8.6.0-rc3/makeopts.in (original)
+++ tags/1.8.6.0-rc3/makeopts.in Thu Aug 25 14:08:04 2011
@@ -34,8 +34,6 @@
MD5=@MD5@
SHA1SUM=@SHA1SUM@
OPENSSL=@OPENSSL@
-MAKE_PREINSTALL=@MAKE_PREINSTALL@
-MAKE_POSTINSTALL=@MAKE_POSTINSTALL@
BUILD_PLATFORM=@BUILD_PLATFORM@
BUILD_CPU=@BUILD_CPU@
@@ -93,35 +91,6 @@
ASTLOGDIR = @astlogdir@
ASTVARRUNDIR = @astvarrundir@
-MAKE_prefix = @MAKE_prefix@
-MAKE_exec_prefix = @MAKE_exec_prefix@
-
-MAKE_datarootdir = @MAKE_datarootdir@
-MAKE_datadir = @MAKE_datadir@
-MAKE_includedir = @MAKE_includedir@
-MAKE_infodir = @MAKE_infodir@
-MAKE_libdir = @MAKE_libdir@
-MAKE_libexecdir = @MAKE_libexecdir@
-MAKE_localstatedir = @MAKE_localstatedir@
-MAKE_mandir = @MAKE_mandir@
-MAKE_sbindir = @MAKE_sbindir@
-MAKE_sharedstatedir = @MAKE_sharedstatedir@
-MAKE_sysconfdir = @MAKE_sysconfdir@
-
-MAKE_ASTSBINDIR = @MAKE_astsbindir@
-MAKE_ASTETCDIR = @MAKE_astetcdir@
-MAKE_ASTHEADERDIR = @MAKE_astheaderdir@
-MAKE_ASTLIBDIR = @MAKE_astlibdir@
-MAKE_ASTMANDIR = @MAKE_astmandir@
-MAKE_astvarlibdir = @MAKE_astvarlibdir@
-MAKE_ASTVARLIBDIR = @MAKE_astvarlibdir@
-MAKE_ASTDATADIR = @MAKE_astdatadir@
-MAKE_ASTDBDIR = @MAKE_astdbdir@
-MAKE_ASTKEYDIR = @MAKE_astkeydir@
-MAKE_ASTSPOOLDIR = @MAKE_astspooldir@
-MAKE_ASTLOGDIR = @MAKE_astlogdir@
-MAKE_ASTVARRUNDIR = @MAKE_astvarrundir@
-
AST_DEVMODE=@AST_DEVMODE@
NOISY_BUILD=@NOISY_BUILD@
Modified: tags/1.8.6.0-rc3/sounds/Makefile
URL: http://svnview.digium.com/svn/asterisk/tags/1.8.6.0-rc3/sounds/Makefile?view=diff&rev=333273&r1=333272&r2=333273
==============================================================================
--- tags/1.8.6.0-rc3/sounds/Makefile (original)
+++ tags/1.8.6.0-rc3/sounds/Makefile Thu Aug 25 14:08:04 2011
@@ -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 -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 -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 -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 || \
+.PHONY: .asterisk-$(2)$(if $(3),-$(3),)-%
+
+.asterisk-$(2)$(if $(3),-$(3),)-%: asterisk-$(2)$(if $(3),-$(3),)-%.tar.gz
+ $(CMD_PREFIX) \
+ if test ! -f "$(1)$(if $(3),/$(3),)/$$@"; then \
+ PACKAGE=$$(subst .asterisk,asterisk,$$@).tar.gz; \
( \
- 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
+ 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
-define sound_download_rule
-asterisk-$(1)-%.tar.gz: have_download
+asterisk-$(2)$(if $(3),-$(3),)-%.tar.gz: have_download
+ifneq ($(SOUNDS_CACHE_DIR),)
$(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 || \
- ( \
- rm -f $$(SOUNDS_CACHE_DIR)/$$@ $$(SOUNDS_CACHE_DIR)/$$@.sha1 $$@ $$@.sha1; \
- echo "Bad checksum: $$@" 1>&2; \
- exit 1; \
- ) || exit 1
-endef
-
+ 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
-endif
-
-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,$(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)
More information about the asterisk-commits
mailing list