add per-target macrofiles to search path.

take globalMacroContext out of macro api.
fix: flush all macros between builds.

CVS patchset: 2936
CVS date: 1999/04/01 22:26:44

1 files changed, 3 insertions, 7 deletions

diff --git a/build.c b/build.c
index c017fd957..516cb19a5 100644
--- a/build.c
+++ b/build.c
@@ -4,12 +4,6 @@
 #include "popt/popt.h"
 #include "build.h"
 
-#ifdef DYING
-int buildForTarget(char *arg, int buildAmount, char *passPhrase,
-	          char *buildRoot, int fromTarball, int test, char *cookie,
-		  force);
-#endif
-
 static int buildForTarget(const char *arg, int buildAmount, const char *passPhrase,
 	          const char *buildRoot, int fromTarball, int test, char *cookie,
 		  int force)
@@ -110,7 +104,7 @@ static int buildForTarget(const char *arg, int buildAmount, const char *passPhra
 	while (*cmd != '/') cmd--;
 	*cmd = '\0';
 
-	addMacro(&globalMacroContext, "_sourcedir", NULL, buf, RMIL_TARBALL);
+	addMacro(NULL, "_sourcedir", NULL, buf, RMIL_TARBALL);
 	xfree(specDir);
 	xfree(tmpSpecFile);
 	specfile = s;
@@ -197,6 +191,8 @@ int build(const char *arg, int buildAmount, const char *passPhrase,
 	    fromTarball, test, cookie, force);
 	if (rc)
 	    return rc;
+
+	freeMacros(NULL);
     }
 
     return 0;