[sr-dev] git:master: makefile: don't install tls certs & cfg by default

[Andrei Pelinescu-Onciul]

Module: sip-router
Branch: master
Commit: 3390d4cf787b58f440ecd46dcb05910b060f8dc4
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3390d4cf787b58f440ecd46dcb05910b060f8dc4

Author: Andrei Pelinescu-Onciul <andrei at iptel.org>
Committer: Andrei Pelinescu-Onciul <andrei at iptel.org>
Date:   Sat Jul 18 11:24:19 2009 +0200

makefile: don't install tls certs & cfg by default

Install tls certs & cfg only if the tls module is installed (moved
certs & cfg installation from the main Makefile to the tls module
Makefile).

---

 Makefile             |    4 ++--
 modules/tls/Makefile |    9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 32b8b2b..7a478c7 100644
--- a/Makefile
+++ b/Makefile
@@ -803,8 +803,8 @@ install-cfg: $(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_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)
diff --git a/modules/tls/Makefile b/modules/tls/Makefile
index 30dacf4..213a484 100644
--- a/modules/tls/Makefile
+++ b/modules/tls/Makefile
@@ -16,6 +16,15 @@ LIBS+= -L$(LOCALBASE)/lib -L$(LOCALBASE)/ssl/lib -lssl  -lcrypto \
 #       have to add -lz -lkrb5   (zlib and kerberos5).
 #       E.g.: make TLS_HOOKS=1 TLS_EXTRA_LIBS="-lz -lkrb5"
 
+$(cfg_prefix)/$(cfg_dir):
+		mkdir -p $(cfg_prefix)/$(cfg_dir)
+
+install-cfg: $(cfg_prefix)/$(cfg_dir)
+	$(INSTALL_CFG) tls.cfg $(cfg_prefix)/$(cfg_dir)
+	./$(SCR_NAME)_cert.sh -d $(cfg_prefix)/$(cfg_dir)
+
+install: install-cfg
+
 
 DEFS+=-DOPENSER_MOD_INTERFACE