Merge with git+ssh://git.ucw.cz/projects/sherlock/GIT/sherlock.git#v3.11

[libucw.git] / lib / perl / Configure.pm

diff --git a/lib/perl/Configure.pm b/lib/perl/Configure.pm
index b16d15a88f3a04a4978072e4e063835bfdb9a0fe..bd1a7cc53f94ad5297beb1b9cd39c07441866d29 100644 (file)
--- a/lib/perl/Configure.pm
+++ b/lib/perl/Configure.pm
@@ -119,7 +119,7 @@ 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);
@@ -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";
 }