From a9d2342f6af5d9e1fb2a6e42d71493300c0c39f9 Mon Sep 17 00:00:00 2001 From: brain Date: Thu, 25 Oct 2007 20:51:58 +0000 Subject: Make install list list automatically generated from build targets and provide facility for installing extra files. Using this, cert.pem and key.pem are only copied to the conf dir if you enabled an ssl module. Also, this provides facility for a 'make deinstall' which should be safe for use in all situations as it always specifies a file by name and never uses wildcards to rm. git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8362 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/configreader.cpp | 8 ++++++++ src/inspircd.cpp | 2 ++ src/modules/extra/m_ssl_gnutls.cpp | 3 ++- src/modules/extra/m_ssl_openssl.cpp | 2 ++ 4 files changed, 14 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/configreader.cpp b/src/configreader.cpp index 4de90cd78..b026f5a9f 100644 --- a/src/configreader.cpp +++ b/src/configreader.cpp @@ -12,6 +12,14 @@ */ /* $Core: libIRCDconfigreader */ +/* $CopyInstall: conf/inspircd.quotes.example $(CONPATH) */ +/* $CopyInstall: conf/inspircd.rules.example $(CONPATH) */ +/* $CopyInstall: conf/inspircd.motd.example $(CONPATH) */ +/* $CopyInstall: conf/inspircd.helpop-full.example $(CONPATH) */ +/* $CopyInstall: conf/inspircd.helpop.example $(CONPATH) */ +/* $CopyInstall: conf/inspircd.censor.example $(CONPATH) */ +/* $CopyInstall: conf/inspircd.filter.example $(CONPATH) */ +/* $CopyInstall: docs/inspircd.conf.example $(CONPATH) */ #include "inspircd.h" #include diff --git a/src/inspircd.cpp b/src/inspircd.cpp index 54d942305..097cd6d0b 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -11,6 +11,8 @@ * --------------------------------------------------- */ +/* $Install: src/inspircd $(BINPATH) */ + #include "inspircd.h" #include diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp index 4b059ca9f..2d806dd4e 100644 --- a/src/modules/extra/m_ssl_gnutls.cpp +++ b/src/modules/extra/m_ssl_gnutls.cpp @@ -35,7 +35,8 @@ /* $CompileFlags: exec("libgnutls-config --cflags") */ /* $LinkerFlags: rpath("libgnutls-config --libs") exec("libgnutls-config --libs") */ /* $ModDep: transport.h */ - +/* $CopyInstall: conf/key.pem $(CONPATH) */ +/* $CopyInstall: conf/cert.pem $(CONPATH) */ enum issl_status { ISSL_NONE, ISSL_HANDSHAKING_READ, ISSL_HANDSHAKING_WRITE, ISSL_HANDSHAKEN, ISSL_CLOSING, ISSL_CLOSED }; diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp index 4696f0357..7d6f24cb3 100644 --- a/src/modules/extra/m_ssl_openssl.cpp +++ b/src/modules/extra/m_ssl_openssl.cpp @@ -42,6 +42,8 @@ /* $LinkerFlags: rpath("pkg-config --libs openssl") pkgconflibs("openssl","/libssl.so","-lssl -lcrypto -ldl") */ /* $ModDep: transport.h */ /* $NoPedantic */ +/* $CopyInstall: conf/key.pem $(CONPATH) */ +/* $CopyInstall: conf/cert.pem $(CONPATH) */ enum issl_status { ISSL_NONE, ISSL_HANDSHAKING, ISSL_OPEN }; enum issl_io_status { ISSL_WRITE, ISSL_READ }; -- cgit v1.2.3