Set `s' and `o' variables in configure.

This helps us avoid explicit references to SRCDIR in the top-level Makefile.

diff --git a/build/Maketop b/build/Maketop
index 2fa010d0ba7c80a183e7b2b228dad3fd3ba20e26..c57d1bec42a4bcbab1414cc9b3592f4ffffc6a01 100644 (file)
--- a/build/Maketop
+++ b/build/Maketop
@@ -7,9 +7,6 @@ V=0
 # Disable all built-in rules and variables. Speeds up make and simplifies debugging.
 MAKEFLAGS+=-rR
 
-s=$(SRCDIR)
-o=obj
-
 CFLAGS=$(CLANG) $(COPT) $(CDEBUG) $(CWARNS) -I. -I$(o) -I$(s)
 LDFLAGS=$(LOPT)
 

diff --git a/lib/perl/Configure.pm b/lib/perl/Configure.pm
index 383639f9ea3fd1ffb61e47208b4b1184852a193a..18ecd911ebd869daf44d322841fa23e93e24d791 100644 (file)
--- a/lib/perl/Configure.pm
+++ b/lib/perl/Configure.pm
@@ -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";
 }