Fix warnings from BSD build and work around the failures of BSD make

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

2 files changed, 6 insertions, 6 deletions

diff --git a/make/calcdep.pl b/make/calcdep.pl
index 7d424f4e3..1c5baeded 100755
--- a/make/calcdep.pl
+++ b/make/calcdep.pl
@@ -138,7 +138,7 @@ sub dep_cpp($$) {
 	gendep $file;
 
 	print MAKE "$out: $file $f2dep{$file}\n";
-	print MAKE "\t@\$(SOURCEPATH)/make/unit-cc.pl \$(VERBOSE) \$< \$\@\n";
+	print MAKE "\t@\$(SOURCEPATH)/make/unit-cc.pl \$(VERBOSE) \$\@ \$< \$>\n";
 }
 
 sub dep_dir($) {
diff --git a/make/unit-cc.pl b/make/unit-cc.pl
index 75c206d8c..d4786b8fe 100755
--- a/make/unit-cc.pl
+++ b/make/unit-cc.pl
@@ -4,16 +4,16 @@ use warnings;
 BEGIN { push @INC, $ENV{SOURCEPATH}; }
 use make::configure;
 
-my $file = shift;
+my $out = shift;
 my $verbose;
 
-if ($file =~ /^-/) {
-	$_ = $file;
-	$file = shift;
+if ($out =~ /^-/) {
+	$_ = $out;
+	$out = shift;
 	$verbose = /v/;
 }
 
-my $out = shift;
+my $file = shift;
 
 my $cflags = $ENV{CXXFLAGS};
 $cflags =~ s/ -pedantic// if nopedantic($file);