Fix makefile remake target to work in BSD make and avoid looping when .config.cache is updated

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@12242 e03df62e-2008-0410-955e-edbf42e46eb7

2 files changed, 10 insertions, 5 deletions

diff --git a/configure b/configure
index fb4d5d842..f6823752a 100755
--- a/configure
+++ b/configure
@@ -232,8 +232,6 @@ if (defined $opt_noipv6)
 {
 	$config{IPV6} = "n";
 }
-chomp($config{GCCVER}       = `g++ -dumpversion | cut -c 1`);   	# Major GCC Version
-chomp($config{GCCMINOR}     = `g++ -dumpversion | cut -c 3`);
 $config{_SOMAXCONN} = SOMAXCONN;					# Max connections in accept queue
 $config{OSNAME}       	    = $^O;			      		# Operating System Name
 $config{IS_DARWIN}	  = "NO";					# Is OSX?
@@ -408,6 +406,11 @@ print ((!getcache()) ? "not found\n" : "found\n");
 $config{SYSTEM} = lc $^O;
 print "Checking operating system version... $config{SYSTEM}\n";
 
+$exec = $config{CC} . " -dumpversion | cut -c 1";
+chomp($config{GCCVER}		= `$exec`);				# Major GCC Version
+$exec = $config{CC} . " -dumpversion | cut -c 3";
+chomp($config{GCCMINOR}		= `$exec`);
+
 printf "Checking if stdint.h exists... ";
 $config{HAS_STDINT} = "true";
 our $fail = 0;
diff --git a/make/template/main.mk b/make/template/main.mk
index e2688cefa..e201432a9 100644
--- a/make/template/main.mk
+++ b/make/template/main.mk
@@ -167,9 +167,11 @@ install: target@EXTRA_DIR@
 	@echo "* REMEMBER TO EDIT YOUR CONFIG FILE *"
 	@echo "*************************************"
 
-@GNU_ONLY RCS_FILES = $(wildcard .git/index .svn/entries .config.cache)
-@GNU_ONLY GNUmakefile: make/template/main.mk configure $(RCS_FILES)
-@GNU_ONLY 	./configure -update
+@GNU_ONLY RCS_FILES = $(wildcard .git/index .svn/entries src/version.sh)
+@BSD_ONLY RCS_FILES = src/version.sh
+GNUmakefile BSDmakefile: make/template/main.mk configure $(RCS_FILES)
+	./configure -update
+@BSD_ONLY .MAKEFILEDEPS: BSDmakefile
 
 clean:
 	@echo Cleaning...