diff options
| author | danieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7> | 2010-02-06 04:29:02 +0000 |
|---|---|---|
| committer | danieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7> | 2010-02-06 04:29:02 +0000 |
| commit | 1d17a9d23e533e0a5e9a0cdec17fd40adf0f0821 (patch) | |
| tree | 908108707eb200c641234eb7c1fc48860b30f9be /make | |
| parent | e071bd88391e00e4d3b0104ada985e08a9eb3210 (diff) | |
Move configuration examples to docs, remove automatic overwrite on make install
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@12383 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'make')
| -rwxr-xr-x | make/install-extras.pl | 29 | ||||
| -rw-r--r-- | make/template/main.mk | 3 |
2 files changed, 1 insertions, 31 deletions
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 |