diff options
| author | Peter Powell <petpow@saberuk.com> | 2013-04-05 16:39:40 +0100 |
|---|---|---|
| committer | Peter Powell <petpow@saberuk.com> | 2013-04-05 16:39:40 +0100 |
| commit | 362f3009ac9a8fc7e1cedea66aa72abcdf52d934 (patch) | |
| tree | 266065ea765be60f52a55208790c52872353a425 /make | |
| parent | bb3aa2fb37071f48a5312df8688c0a6990644fbb (diff) | |
Merge inspircd_{config,version}.h into a single header file.
Diffstat (limited to 'make')
| -rwxr-xr-x | make/calcdep.pl | 2 | ||||
| -rw-r--r-- | make/template/main.mk | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/make/calcdep.pl b/make/calcdep.pl index 4a759a24a..e578f585c 100755 --- a/make/calcdep.pl +++ b/make/calcdep.pl @@ -199,7 +199,7 @@ sub gendep($) { while (<$in>) { if (/^\s*#\s*include\s*"([^"]+)"/) { my $inc = $1; - next if $inc eq 'inspircd_version.h' && $f eq '../include/inspircd.h'; + next if $inc eq 'config.h' && $f eq '../include/inspircd.h'; my $found = 0; for my $loc ("$basedir/$inc", "../include/$inc") { next unless -e $loc; diff --git a/make/template/main.mk b/make/template/main.mk index 32b7e4803..4930fa7e3 100644 --- a/make/template/main.mk +++ b/make/template/main.mk @@ -276,8 +276,7 @@ configureclean: rm -f .config.cache rm -f BSDmakefile rm -f GNUmakefile - rm -f include/inspircd_config.h - rm -f include/inspircd_version.h + rm -f include/config.h rm -f inspircd -rm -f org.inspircd.plist |