Browse Source

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).
Andrei Pelinescu-Onciul 16 years ago
parent
commit
3390d4cf78
2 changed files with 11 additions and 2 deletions
  1. 2 2
      Makefile
  2. 9 0
      modules/tls/Makefile

+ 2 - 2
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)

+ 9 - 0
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