X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Fperl%2FConfigure.pm;h=bd1a7cc53f94ad5297beb1b9cd39c07441866d29;hb=e81deace1bca5d3329d41d3207fcb6e866b9d1d6;hp=f251ce62c463c55204131b911ce278f6d9bec07f;hpb=97bd72a420e0832463b52948d8c692ab46d88607;p=libucw.git

diff --git a/lib/perl/Configure.pm b/lib/perl/Configure.pm
index f251ce62..bd1a7cc5 100644
--- a/lib/perl/Configure.pm
+++ b/lib/perl/Configure.pm
@@ -119,12 +119,12 @@ sub Init($$) {
 		if ($x =~ /^(\w+)=(.*)/) {
 			Override($1 => $2);
 		} elsif ($x =~ /^-(\w+)$/) {
-			Override($1 => 1);
+			Override($1 => 0);
 			delete $vars{$1};
 		} elsif ($x =~ /^(\w+)$/) {
 			Override($1 => 1);
 		} else {
-			print STDERR "Invalid option $_\n";
+			print STDERR "Invalid option $x\n";
 			exit 1;
 		}
 	}
@@ -162,7 +162,7 @@ sub Finish() {
 	Log "done\n";
 
 	Log "Generating autoconf.h ... ";
-	open X, ">obj/lib/autoconf.h" or Fail $!;
+	open X, ">obj/autoconf.h" or Fail $!;
 	print X "/* Generated automatically by $0, please don't touch manually. */\n";
 	foreach my $x (sort keys %vars) {
 		# Don't export variables which contain no underscores
@@ -181,6 +181,8 @@ sub Finish() {
 	foreach my $x (sort keys %vars) {
 		print X "$x=$vars{$x}\n";
 	}
+	print X "s=\${SRCDIR}\n";
+	print X "o=obj\n";
 	close X;
 	Log "done\n";
 }