summaryrefslogtreecommitdiff
path: root/make
diff options
context:
space:
mode:
authorSadie Powell <sadie@witchery.services>2020-09-26 23:32:09 +0100
committerSadie Powell <sadie@witchery.services>2020-09-26 23:34:03 +0100
commitb64fe8320ecbcc3f6099a3c0ae1b2739447bfc76 (patch)
tree927a8ad5bc5c1098f42db2c185cfe1e93d8d6a9a /make
parentd0bb6bd79a7909b498ad018b4a9f6f90d4e89787 (diff)
Store generated SSL certificates in the .configure directory.
Co-Authored-By: Nicole Kleinhoff <ilbelkyr@shalture.org>
Diffstat (limited to 'make')
-rw-r--r--make/configure.pm1
-rw-r--r--make/template/inspircd-genssl.12
-rw-r--r--make/template/main.mk2
3 files changed, 3 insertions, 2 deletions
diff --git a/make/configure.pm b/make/configure.pm
index cb9b8f640..fd1833d5f 100644
--- a/make/configure.pm
+++ b/make/configure.pm
@@ -45,6 +45,7 @@ use constant CONFIGURE_ERROR_PIPE => $ENV{INSPIRCD_VERBOSE} ? '' : '1>/dev/nu
our @EXPORT = qw(CONFIGURE_CACHE_FILE
CONFIGURE_CACHE_VERSION
+ CONFIGURE_DIRECTORY
cmd_clean
cmd_help
cmd_update
diff --git a/make/template/inspircd-genssl.1 b/make/template/inspircd-genssl.1
index 93f05ff58..7a1f70c6a 100644
--- a/make/template/inspircd-genssl.1
+++ b/make/template/inspircd-genssl.1
@@ -24,7 +24,7 @@
.BR
.SH "SYNOPSIS"
-\t\fBinspircd-genssl\fR [ auto | gnutls | openssl ]
+\t\fBinspircd-genssl\fR [ auto | gnutls | openssl ] [ SSL-DIR ]
.SH "OPTIONS"
.TP
diff --git a/make/template/main.mk b/make/template/main.mk
index 9f905f970..5a2107d3d 100644
--- a/make/template/main.mk
+++ b/make/template/main.mk
@@ -250,7 +250,7 @@ endif
-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/*.example $(EXAPATH)/services
-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(EXAPATH)/sql
-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/help.txt $(CONPATH)
- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_PRV) *.pem $(CONPATH) 2>/dev/null
+ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_PRV) @CONFIGURE_DIRECTORY@/*.pem $(CONPATH) 2>/dev/null
@echo ""
@echo "*************************************"
@echo "* INSTALL COMPLETE! *"