diff --git a/Makefile.defs b/Makefile.defs index 273ba7bd..5d239cc1 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -320,8 +320,6 @@ INSTALL ?= install TAR ?= tar endif -INSTALL_TOUCH = touch # used to create the file first (good to - # make solaris install work) INSTALL_CFG = $(INSTALL) -m 644 INSTALL_BIN = $(INSTALL) -m 755 INSTALL_MODULES = $(INSTALL) -m 755 @@ -337,7 +335,7 @@ export start_script export cfg_prefix bin_prefix modules_prefix doc_prefix audio_prefix lib_prefix export cfg_dir bin_dir modules_dir audio_dir lib_dir doc_dir man_dir export bin_target cfg_target app_cfg_target modules_target audio_target lib_target -export INSTALL TAR INSTALL_TOUCH INSTALL_CFG INSTALL_BIN INSTALL_MODULES INSTALL_DOC INSTALL_AUDIO +export INSTALL TAR INSTALL_CFG INSTALL_BIN INSTALL_MODULES INSTALL_DOC INSTALL_AUDIO export APP_NAME export USE_SPANDSP LIBSPANDSP_STATIC LIBSPANDSP_LDIR diff --git a/apps/dsm/mods/Makefile.dsm_module b/apps/dsm/mods/Makefile.dsm_module index 7fa8a1d8..55f5ec55 100644 --- a/apps/dsm/mods/Makefile.dsm_module +++ b/apps/dsm/mods/Makefile.dsm_module @@ -39,7 +39,6 @@ clean: $(extra_clean) install: all $(extra_install) mkdir -p $(DESTDIR)$(lib_prefix)/$(lib_dir)/dsm if [ -f "$(lib_name)" ]; then \ - $(INSTALL_TOUCH) $(DESTDIR)$(lib_prefix)/$(lib_dir)/dsm/; \ $(INSTALL_MODULES) $(lib_name) $(DESTDIR)$(lib_prefix)/$(lib_dir)/dsm/; \ fi @@ -49,7 +48,6 @@ install-cfg: @set -e; \ for r in $(module_conf_files); do \ echo installing $$r ; \ - $(INSTALL_TOUCH) $(DESTDIR)$(cfg_target)$$r ; \ sed -e "s#/usr/.*lib/sems/audio/#$(audio_target)#g" \ -e "s#/usr/.*lib/sems/plug-in/#$(modules_target)#g" \ -e "s#/usr/.*lib/sems/ivr/#$(lib_target)ivr/#g" \ @@ -68,7 +66,6 @@ $(plug_in_name)_audio: $(DESTDIR)$(audio_prefix)/$(audio_dir) @set -e; \ for f in $(AUDIO_FILES) ; do \ if [ -n "wav/$$f" ]; then \ - $(INSTALL_TOUCH) $(DESTDIR)$(audio_prefix)/$(audio_dir)$(plug_in_name)/$$f; \ $(INSTALL_AUDIO) wav/$$f $(DESTDIR)$(audio_prefix)/$(audio_dir)$(plug_in_name)/$$f; \ fi ; \ done @@ -79,7 +76,6 @@ $(plug_in_name)_lib: @set -e; \ for f in $(EXTRA_LIB_FILES) ; do \ if [ -n "$(EXTRA_LIB_DIR)/$$f" ]; then \ - $(INSTALL_TOUCH) $(DESTDIR)$(lib_prefix)/$(lib_dir)/$(plug_in_name)/$$f; \ $(INSTALL_AUDIO) $(EXTRA_LIB_DIR)$$f $(DESTDIR)$(lib_prefix)/$(lib_dir)/$(plug_in_name)/$$f; \ fi ; \ done diff --git a/apps/ivr/Makefile b/apps/ivr/Makefile index d2d6d4a6..e23cf11e 100644 --- a/apps/ivr/Makefile +++ b/apps/ivr/Makefile @@ -95,7 +95,6 @@ install_python_files: $(DESTDIR)$(modules_prefix)/$(modules_dir) echo "Installing Python object files..." for f in $(py_obj) ; do \ if [ -n "py/$$f" ]; then \ - $(INSTALL_TOUCH) $(DESTDIR)$(modules_prefix)/$(modules_dir)/$$f; \ $(INSTALL_MODULES) py/$$f $(DESTDIR)$(modules_prefix)/$(modules_dir)/$$f; \ fi ; \ done diff --git a/apps/ivr/Makefile.ivr_application b/apps/ivr/Makefile.ivr_application index e44ef392..d2096947 100644 --- a/apps/ivr/Makefile.ivr_application +++ b/apps/ivr/Makefile.ivr_application @@ -56,7 +56,6 @@ install-cfg: @set -e; \ for r in $(module_conf_files); do \ echo installing $$r ; \ - $(INSTALL_TOUCH) $(DESTDIR)$(app_cfg_target)$$r ; \ sed -e "s#/usr/.*lib/sems/audio/#$(audio_target)#g" \ -e "s#/usr/.*lib/sems/plug-in/#$(modules_target)#g" \ -e "s#/usr/.*etc/sems/#$(app_cfg_target)#g" \ @@ -72,7 +71,6 @@ $(NAME)_audio: $(DESTDIR)$(audio_prefix)/$(audio_dir) @set -e; \ for f in $(AUDIO_FILES) ; do \ if [ -n "wav/$$f" ]; then \ - $(INSTALL_TOUCH) $(DESTDIR)$(audio_prefix)/$(audio_dir)$(NAME)/$$f; \ $(INSTALL_AUDIO) wav/$$f $(DESTDIR)$(audio_prefix)/$(audio_dir)$(NAME)/$$f; \ fi ; \ done diff --git a/apps/monitoring/tools/Makefile b/apps/monitoring/tools/Makefile index 7feb48dc..ea59f42b 100644 --- a/apps/monitoring/tools/Makefile +++ b/apps/monitoring/tools/Makefile @@ -11,7 +11,6 @@ install_tools: $(DESTDIR)$(bin_prefix)/$(bin_dir) for r in $(monitoring_scripts) ; do \ x=`echo $$r | sed s/sems-/$(APP_NAME)-/g` ; \ echo "installing $$r -> $$x" ; \ - $(INSTALL_TOUCH) $(DESTDIR)$(bin_prefix)/$(bin_dir)/$$x ; \ $(INSTALL_BIN) $$r $(DESTDIR)$(bin_prefix)/$(bin_dir)/$$x ; \ done diff --git a/apps/py_sems/Makefile b/apps/py_sems/Makefile index c6a09cdb..b96970f9 100644 --- a/apps/py_sems/Makefile +++ b/apps/py_sems/Makefile @@ -89,7 +89,6 @@ install_python_files: $(DESTDIR)$(modules_prefix)/$(modules_dir) echo "Installing Python object files..." for f in $(py_obj) ; do \ if [ -n "py/$$f" ]; then \ - $(INSTALL_TOUCH) $(DESTDIR)$(modules_prefix)/$(modules_dir)/$$f; \ $(INSTALL_MODULES) py/$$f $(DESTDIR)$(modules_prefix)/$(modules_dir)/$$f; \ fi ; \ done diff --git a/apps/py_sems/Makefile.py_sems_application b/apps/py_sems/Makefile.py_sems_application index 1f809b31..d97ddb5c 100644 --- a/apps/py_sems/Makefile.py_sems_application +++ b/apps/py_sems/Makefile.py_sems_application @@ -48,7 +48,6 @@ install-cfg: @set -e; \ for r in $(module_conf_files); do \ echo installing $$r ; \ - $(INSTALL_TOUCH) $(cfg_target)$$r ; \ sed -e "s#/usr/.*lib/sems/audio/#$(audio_target)#g" \ -e "s#/usr/.*lib/sems/plug-in/#$(modules_target)#g" \ -e "s#/usr/.*etc/sems/#$(cfg_target)#g" \ diff --git a/apps/sbc/tools/Makefile b/apps/sbc/tools/Makefile index 6ee0a5d4..68d9b54c 100644 --- a/apps/sbc/tools/Makefile +++ b/apps/sbc/tools/Makefile @@ -13,7 +13,6 @@ install_tools: $(DESTDIR)$(bin_prefix)/$(bin_dir) for r in $(sbc_scripts) ; do \ x=`echo $$r | sed s/sems-/$(APP_NAME)-/g` ; \ echo "installing $$r -> $$x" ; \ - $(INSTALL_TOUCH) $(DESTDIR)$(bin_prefix)/$(bin_dir)/$$x ; \ $(INSTALL_BIN) $$r $(DESTDIR)$(bin_prefix)/$(bin_dir)/$$x ; \ done diff --git a/apps/voicemail/Makefile b/apps/voicemail/Makefile index 6e7d047c..6b1e0a84 100644 --- a/apps/voicemail/Makefile +++ b/apps/voicemail/Makefile @@ -22,7 +22,6 @@ vm_module: all .PHONY: install_email_template install_email_template: $(DESTDIR)$(app_cfg_target) - $(INSTALL_TOUCH) $(DESTDIR)$(app_cfg_target)default.template.sample $(INSTALL_CFG) default.template.sample $(DESTDIR)$(app_cfg_target) if [ ! -f $(DESTDIR)$(app_cfg_target)default.template ]; then \ cp -f $(DESTDIR)$(app_cfg_target)default.template.sample \ diff --git a/apps/webconference/tools/Makefile b/apps/webconference/tools/Makefile index 179a505f..82eb76c2 100644 --- a/apps/webconference/tools/Makefile +++ b/apps/webconference/tools/Makefile @@ -12,7 +12,6 @@ install_tools: $(DESTDIR)$(bin_prefix)/$(bin_dir) for r in $(wc_scripts) ; do \ x=`echo $$r | sed s/sems-/$(APP_NAME)-/g` ; \ echo "installing $$r -> $$x" ; \ - $(INSTALL_TOUCH) $(DESTDIR)$(bin_prefix)/$(bin_dir)/$$x ; \ $(INSTALL_BIN) $$r $(DESTDIR)$(bin_prefix)/$(bin_dir)/$$x ; \ done diff --git a/core/Makefile b/core/Makefile index 9a3821f1..0ebff399 100644 --- a/core/Makefile +++ b/core/Makefile @@ -136,7 +136,6 @@ install-cfg: $(DESTDIR)$(cfg_target) $(DESTDIR)$(app_cfg_target) $(INSTALL_CFG) etc/app_mapping.conf.sample $(DESTDIR)$(app_cfg_target)app_mapping.conf install-bin: $(DESTDIR)$(bin_prefix)/$(bin_dir) - $(INSTALL_TOUCH) $(DESTDIR)$(bin_prefix)/$(bin_dir)$(NAME) $(INSTALL_BIN) $(NAME) $(DESTDIR)$(bin_prefix)/$(bin_dir) install-modules: $(PLUGIN_DIR) $(DESTDIR)$(modules_prefix)/$(modules_dir) @@ -148,7 +147,6 @@ install-modules-cfg: $(PLUGIN_DIR) install-audio: $(DESTDIR)$(audio_prefix)/$(audio_dir) for f in $(AUDIO_FILES) ; do \ if [ -n "wav/$$f" ]; then \ - $(INSTALL_TOUCH) $(DESTDIR)$(audio_prefix)/$(audio_dir)$$f; \ $(INSTALL_AUDIO) wav/$$f $(DESTDIR)$(audio_prefix)/$(audio_dir)$$f; \ fi ; \ done diff --git a/core/plug-in/Makefile.app_module b/core/plug-in/Makefile.app_module index 5e92c9dc..652fd4d4 100644 --- a/core/plug-in/Makefile.app_module +++ b/core/plug-in/Makefile.app_module @@ -39,7 +39,6 @@ clean: $(extra_clean) .PHONY: install install: all $(extra_install) $(DESTDIR)$(modules_prefix)/$(modules_dir) if [ -f "$(lib_name)" ]; then \ - $(INSTALL_TOUCH) $(DESTDIR)$(modules_prefix)/$(modules_dir)/$(lib_name) ; \ $(INSTALL_MODULES) $(lib_name) $(DESTDIR)$(modules_prefix)/$(modules_dir); \ fi @@ -48,7 +47,6 @@ install-cfg: $(DESTDIR)$(app_cfg_target) @set -e; \ for r in $(module_conf_files); do \ echo installing $$r ; \ - $(INSTALL_TOUCH) $(DESTDIR)$(app_cfg_target)$$r ; \ sed -e "s#/usr/.*lib/sems/audio/#$(audio_target)#g" \ -e "s#/usr/.*lib/sems/plug-in/#$(modules_target)#g" \ -e "s#/usr/.*lib/sems/ivr/#$(lib_target)ivr/#g" \ @@ -67,7 +65,6 @@ $(plug_in_name)_audio: $(DESTDIR)$(audio_prefix)/$(audio_dir) @set -e; \ for f in $(AUDIO_FILES) ; do \ if [ -n "wav/$$f" ]; then \ - $(INSTALL_TOUCH) $(DESTDIR)$(audio_prefix)/$(audio_dir)$(plug_in_name)/$$f; \ $(INSTALL_AUDIO) wav/$$f $(DESTDIR)$(audio_prefix)/$(audio_dir)$(plug_in_name)/$$f; \ fi ; \ done @@ -78,7 +75,6 @@ $(plug_in_name)_lib: @set -e; \ for f in $(EXTRA_LIB_FILES) ; do \ if [ -n "$(EXTRA_LIB_DIR)/$$f" ]; then \ - $(INSTALL_TOUCH) $(DESTDIR)$(lib_prefix)/$(lib_dir)/$(plug_in_name)/$$f; \ $(INSTALL_AUDIO) $(EXTRA_LIB_DIR)$$f $(DESTDIR)$(lib_prefix)/$(lib_dir)/$(plug_in_name)/$$f; \ fi ; \ done diff --git a/core/plug-in/Makefile.audio_module b/core/plug-in/Makefile.audio_module index 0b591632..082dd00c 100644 --- a/core/plug-in/Makefile.audio_module +++ b/core/plug-in/Makefile.audio_module @@ -33,7 +33,6 @@ clean: $(extra_clean) .PHONY: install install: $(lib_name) $(extra_install) mkdir -p $(DESTDIR)$(modules_prefix)/$(modules_dir) - $(INSTALL_TOUCH) $(DESTDIR)$(modules_prefix)/$(modules_dir)/$(lib_name) ; \ $(INSTALL_MODULES) $(lib_name) $(DESTDIR)$(modules_prefix)/$(modules_dir) .PHONY: install-cfg diff --git a/core/plug-in/stats/Makefile b/core/plug-in/stats/Makefile index c9159814..a3623cc2 100644 --- a/core/plug-in/stats/Makefile +++ b/core/plug-in/stats/Makefile @@ -20,7 +20,6 @@ $(QUERY_STATS_NAME): query_stats.o Makefile $(LD) -o $(QUERY_STATS_NAME) query_stats.o $(LDFLAGS) $(EXTRA_LDFLAGS) install_query_stats: $(QUERY_STATS_NAME) $(DESTDIR)$(bin_prefix)/$(bin_dir) - $(INSTALL_TOUCH) $(DESTDIR)$(bin_prefix)/$(bin_dir)$(QUERY_STATS_DEST_NAME) $(INSTALL_BIN) $(QUERY_STATS_NAME) $(DESTDIR)$(bin_prefix)/$(bin_dir)/$(QUERY_STATS_DEST_NAME) clean_query_stats: diff --git a/tools/Makefile b/tools/Makefile index 0d8bb3b4..f248442c 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -14,7 +14,6 @@ install_tools: $(DESTDIR)$(bin_prefix)/$(bin_dir) for r in $(sems_tools) ; do \ x=`echo $$r | sed s/sems-/$(APP_NAME)-/g` ; \ echo "installing $$r -> $$x" ; \ - $(INSTALL_TOUCH) $(DESTDIR)$(bin_prefix)/$(bin_dir)/$$x ; \ $(INSTALL_BIN) $$r $(DESTDIR)$(bin_prefix)/$(bin_dir)/$$x ; \ done