X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=configure;h=7192a8e97ed6852b3724bdc0981cf2a4f71a48d8;hb=a47b242c9f2504228bb463305fac6f2235193215;hp=eff8109ffd6decd70ea7e79bbc1b6745d57019f6;hpb=89ee7167a17cc95ca0ff9e499f50166fdf6e48a0;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/configure b/configure
index eff8109ff..7192a8e97 100755
--- a/configure
+++ b/configure
@@ -43,7 +43,7 @@ chomp($config{GCCVER}       = `gcc -dumpversion | cut -c 1`);   		# Major GCC Ve
 chomp($config{GCC34}        = `gcc -dumpversion | cut -c 3`);   		# Minor GCC Version
 chomp($config{OSNAME}       = `/bin/uname`);                      		# Operating System Name
 $config{CC} 		    = "g++";						# C++ compiler
-$config{MAKEORDER}	    = "ircd mods config bininst";			# build order
+$config{MAKEORDER}	    = "ircd mods";					# build order
 $config{STATICLIBS}         = "";						# library archive path
 $config{MAX_IDENT}          = "12";						# max ident size
 $config{MAX_QUIT}           = "255";						# max quit message size
@@ -101,6 +101,15 @@ if ($arg eq "-update") {
 	}
 }
 
+if ($arg eq "-svnupdate") {
+	system("svn update");
+	system("perl configure -update");
+	if ($ARGV[1] eq "rebuild") {
+		system("make install");
+	}
+	exit;
+}
+
 if ($arg eq "-modupdate") {
 	# Does the cache file exist?
 	if (!getcache()) {
@@ -816,12 +825,12 @@ sub getosflags {
 			$config{FLAGS}  = "-frtti -Wall -Woverloaded-virtual $config{OPTIMISATI}";
 			$config{LDLIBS} = "";
 			$config{MAKEPROG} = "/usr/bin/make";
-			$config{MAKEORDER} = "ircd mods config bininst";
+			$config{MAKEORDER} = "ircd mods";
 		} elsif ($config{OSNAME} eq "CYG-STATIC") {
 			$config{FLAGS} = "-frtti -Wall -Woverloaded-virtual $config{OPTIMISATI}";
 			$config{LDLIBS} = "";
 			$config{MAKEPROG} = "/usr/bin/make";
-			$config{MAKEORDER} = "mods ircd config bininst";
+			$config{MAKEORDER} = "mods ircd";
 			$config{STATICLIBS} = "modules/mods.a";
 			$config{STATIC_LINK} = "yes";
 		}
@@ -869,7 +878,7 @@ sub writefiles {
 	chomp(my $incos = `uname -n -s -r`);
 	chomp(my $version = `sh ./src/version.sh`);
         chomp(my $revision = `./src/svn-rev.sh`);
-	$version = "$version (r$revision)";
+	$version = "$version(r$revision)";
 	chomp(my $revision2 = `./src/svn-rev.sh`);
 	open(FILEHANDLE, ">include/inspircd_config.h");
 	my $NL = $config{NICK_LENGT}+1;
@@ -1228,7 +1237,7 @@ EOCHEESE
 	# End Write Entry to the MakeFile
 	###
 	}
-	print FILEHANDLE "modinst:\n	echo \"*** Installing InspIRCd\"\n" . $crud;
+	print FILEHANDLE "modinst:\n	\@echo \"Installing modules...\"\n" . $crud;
 }