From: Martin Mares <mj@ucw.cz>
Date: Wed, 18 Jul 2007 21:21:22 +0000 (+0200)
Subject: Set `s' and `o' variables in configure.
X-Git-Tag: holmes-import~506^2~41
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=ebc61451614fb62a13e55c3974f538a06b7463a8;p=libucw.git

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 2fa010d0..c57d1bec 100644
--- 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 383639f9..18ecd911 100644
--- 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";
 }