git:master: makefile: utils and cfg cleanup - sr-dev

1 Oct 2009

Module: sip-router
Branch: master
Commit: 48dd70783900038f379a35817df942dc59d5e646
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=48dd7078...
Author: Andrei Pelinescu-Onciul andrei@iptel.org
Committer: Andrei Pelinescu-Onciul andrei@iptel.org
Date:   Thu Oct  1 16:02:51 2009 +0200
makefile:  utils and cfg cleanup
Moved sercmd, sip-router_mysql.sh and tls.cfg install to their
respective modules.
---
Makefile |   13 +------------
 1 files changed, 1 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index b7d2bbe..ec2b9ba 100644
--- a/Makefile
+++ b/Makefile
@@ -336,7 +336,7 @@ cmodules=$(foreach mods,$(modules_dirs), $($(mods)))
 # which utils need compilation (directory path) and which to install
 # (full path including file name)
 utils_compile=	utils/gen_ha1 utils/sercmd
-utils_bin_install=	utils/gen_ha1/gen_ha1 utils/sercmd/sercmd
+utils_bin_install=	utils/gen_ha1/gen_ha1 # sercmd is now installed by ctl
 utils_script_install=
# This is the list of files to be installed into the arch-independent
@@ -801,11 +801,6 @@ install-cfg: $(cfg_prefix)/$(cfg_dir)
    	$(INSTALL_TOUCH) $(cfg_prefix)/$(cfg_dir)/dictionary.$(CFG_NAME)
    	$(INSTALL_CFG) etc/dictionary.$(CFG_NAME) $(cfg_prefix)/$(cfg_dir)
-		# TLS configuration
-		$(INSTALL_TOUCH) $(cfg_prefix)/$(cfg_dir)/tls.cfg
-		#$(INSTALL_CFG) modules/tls/tls.cfg $(cfg_prefix)/$(cfg_dir)
-		#modules/tls/$(SCR_NAME)_cert.sh -d $(cfg_prefix)/$(cfg_dir)
-
 install-bin: $(bin_prefix)/$(bin_dir) $(NAME)
    	$(INSTALL_TOUCH) $(bin_prefix)/$(bin_dir)/$(NAME)
    	$(INSTALL_BIN) $(NAME) $(bin_prefix)/$(bin_dir)
@@ -866,12 +861,6 @@ install-utils: utils $(bin_prefix)/$(bin_dir)
    		fi ;\
    	fi ; \
    done; true
-	# FIXME: This is a hack, this should be (and will be) done properly in
-    # per-module Makefiles
-	sed -e "s#^DEFAULT_SCRIPT_DIR.*#DEFAULT_SCRIPT_DIR="$(share_prefix)/$(share_dir)"#g" \
-		< scripts/mysql/$(SCR_NAME)_mysql.sh > \
-			$(bin_prefix)/$(bin_dir)/$(MAIN_NAME)_mysql.sh
-	chmod 755 $(bin_prefix)/$(bin_dir)/$(MAIN_NAME)_mysql.sh
install-modules-all: install-every-module install-every-module-doc

    