22 files changed, 1 insertions, 49 deletions
diff --git a/conf/aliases/anope.conf.example b/docs/aliases/anope.conf.example
index 406adc29a..406adc29a 100644
--- a/conf/aliases/anope.conf.example
+++ b/docs/aliases/anope.conf.example
diff --git a/conf/aliases/atheme.conf.example b/docs/aliases/atheme.conf.example
index 7a0bc015a..7a0bc015a 100644
--- a/conf/aliases/atheme.conf.example
+++ b/docs/aliases/atheme.conf.example
diff --git a/conf/aliases/ircservices.conf.example b/docs/aliases/ircservices.conf.example
index a4c31dd05..a4c31dd05 100644
--- a/conf/aliases/ircservices.conf.example
+++ b/docs/aliases/ircservices.conf.example
diff --git a/conf/aliases/neostats.conf.example b/docs/aliases/neostats.conf.example
index baa7fe0ba..baa7fe0ba 100644
--- a/conf/aliases/neostats.conf.example
+++ b/docs/aliases/neostats.conf.example
diff --git a/conf/inspircd.censor.example b/docs/inspircd.censor.example
index 05d9ce6fa..05d9ce6fa 100644
--- a/conf/inspircd.censor.example
+++ b/docs/inspircd.censor.example
diff --git a/conf/inspircd.conf.example b/docs/inspircd.conf.example
index 0b8c466ad..0b8c466ad 100644
--- a/conf/inspircd.conf.example
+++ b/docs/inspircd.conf.example
diff --git a/conf/inspircd.filter.example b/docs/inspircd.filter.example
index 8200a028f..8200a028f 100644
--- a/conf/inspircd.filter.example
+++ b/docs/inspircd.filter.example
diff --git a/conf/inspircd.helpop-full.example b/docs/inspircd.helpop-full.example
index 48e5186d8..48e5186d8 100644
--- a/conf/inspircd.helpop-full.example
+++ b/docs/inspircd.helpop-full.example
diff --git a/conf/inspircd.helpop.example b/docs/inspircd.helpop.example
index 8a53629e9..8a53629e9 100644
--- a/conf/inspircd.helpop.example
+++ b/docs/inspircd.helpop.example
diff --git a/conf/inspircd.motd.example b/docs/inspircd.motd.example
index 73e9f6082..73e9f6082 100644
--- a/conf/inspircd.motd.example
+++ b/docs/inspircd.motd.example
diff --git a/conf/inspircd.quotes.example b/docs/inspircd.quotes.example
index 56a580e33..56a580e33 100644
--- a/conf/inspircd.quotes.example
+++ b/docs/inspircd.quotes.example
diff --git a/conf/inspircd.rules.example b/docs/inspircd.rules.example
index e51f0afd9..e51f0afd9 100644
--- a/conf/inspircd.rules.example
+++ b/docs/inspircd.rules.example
diff --git a/conf/links.conf.example b/docs/links.conf.example
index 2357220f9..2357220f9 100644
--- a/conf/links.conf.example
+++ b/docs/links.conf.example
diff --git a/conf/modules.conf.example b/docs/modules.conf.example
index cc8620e89..cc8620e89 100644
--- a/conf/modules.conf.example
+++ b/docs/modules.conf.example
diff --git a/conf/modules/modules.conf.charybdis b/docs/modules/modules.conf.charybdis
index 509886269..509886269 100644
--- a/conf/modules/modules.conf.charybdis
+++ b/docs/modules/modules.conf.charybdis
diff --git a/conf/modules/modules.conf.unreal b/docs/modules/modules.conf.unreal
index 105acefee..105acefee 100644
--- a/conf/modules/modules.conf.unreal
+++ b/docs/modules/modules.conf.unreal
diff --git a/conf/opers.conf.example b/docs/opers.conf.example
index 0d1e6cd49..0d1e6cd49 100644
--- a/conf/opers.conf.example
+++ b/docs/opers.conf.example
diff --git a/make/install-extras.pl b/make/install-extras.pl
deleted file mode 100755
index ce77178e9..000000000
--- a/make/install-extras.pl
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/perl
-use strict;
-use warnings;
-
-my $mode = shift;
-my %installed;
-
-for my $dir (qw(src src/modules)) {
-	opendir(DIRHANDLE, $dir);
-	for my $file (sort readdir(DIRHANDLE)) {
-		next unless $file =~ /\.cpp$/;
-		open CPP, '<', "$dir/$file" or die "Can't open $dir/$file to scan it: $!";
-		while (<CPP>) {
-			if (/\/\* \$CopyInstall: (\S+) (\S+) (.*) \*\//i) {
-				my($ifile, $idir, $args) = ($1,$2,$3);
-				next if exists $installed{$1.' '.$2};
-				$installed{$1.' '.$2}++;
-				$idir =~ s/\$\(([^)]+)\)/$ENV{$1}/eg;
-				if ($mode eq 'install') {
-					system "install $args $ifile $idir";
-				} else {
-					$ifile =~ s/.*\///g;
-					system "rm $idir/$ifile";
-				}
-			}
-		}
-	}
-	closedir(DIRHANDLE);
-}
diff --git a/make/template/main.mk b/make/template/main.mk
index 964e12fae..acdcfbe5a 100644
--- a/make/template/main.mk
+++ b/make/template/main.mk
@@ -159,7 +159,7 @@ install: target@EXTRA_DIR@
 	-install -m $(INSTMODE_BIN) @STARTSCRIPT@ $(BASE) 2>/dev/null
 	-install -m $(INSTMODE_BIN) $(BUILDPATH)/bin/inspircd $(BINPATH)
 	-install -m $(INSTMODE_LIB) $(BUILDPATH)/modules/*.so $(MODPATH)
-	@$(MAKEENV) make/install-extras.pl install
+	-install -m $(INSTMODE_LIB) tools/gdbargs $(BASE)/.gdbargs 2>/dev/null
 	@echo ""
 	@echo "*************************************"
 	@echo "*        INSTALL COMPLETE!          *"
@@ -187,7 +187,6 @@ clean:
 deinstall:
 	-rm $(BINPATH)/inspircd
 	-rm $(MODPATH)/*.so
-	@make/install-extras.pl deinstall
 
 squeakyclean: distclean
 
diff --git a/src/configreader.cpp b/src/configreader.cpp
index 9db1f2665..20cc0c2b3 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -11,20 +11,6 @@
  * ---------------------------------------------------
  */
 
-/* $Core */
-/* $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: conf/inspircd.conf.example $(CONPATH) */
-/* $CopyInstall: conf/modules.conf.example $(CONPATH) */
-/* $CopyInstall: conf/opers.conf.example $(CONPATH) */
-/* $CopyInstall: conf/links.conf.example $(CONPATH) */
-/* $CopyInstall: tools/gdbargs $(BASE)/.gdbargs */
-
 #include "inspircd.h"
 #include <fstream>
 #include "xline.h"
diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index 3e72fbd36..a0804ddf9 100644
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -24,8 +24,6 @@
 /* $ModDesc: Provides SSL support for clients */
 /* $CompileFlags: pkgconfincludes("gnutls","/gnutls/gnutls.h","") */
 /* $LinkerFlags: rpath("pkg-config --libs gnutls") pkgconflibs("gnutls","/libgnutls.so","-lgnutls") */
-/* $CopyInstall: conf/key.pem $(CONPATH) -m 0400 -o $(INSTUID) */
-/* $CopyInstall: conf/cert.pem $(CONPATH) -m 0444 */
 
 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 261105969..018d7351e 100644
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -30,8 +30,6 @@
 /* $LinkerFlags: if(!"USE_FREEBSD_BASE_SSL") rpath("pkg-config --libs openssl") pkgconflibs("openssl","/libssl.so","-lssl -lcrypto -ldl") */
 
 /* $NoPedantic */
-/* $CopyInstall: conf/key.pem $(CONPATH) -m 0400 -o $(INSTUID) */
-/* $CopyInstall: conf/cert.pem $(CONPATH) -m 0444 */
 
 
 enum issl_status { ISSL_NONE, ISSL_HANDSHAKING, ISSL_OPEN };