From 53da8d703e228f7107688aa38fe305a0ba8d91e4 Mon Sep 17 00:00:00 2001
From: Arch Librarian <arch@canonical.com>
Date: Mon, 20 Sep 2004 16:51:21 +0000
Subject: Fixed make woops Author: jgg Date: 1998-11-06 03:10:24 GMT Fixed make
 woops

---
 Makefile               |  4 ++--
 buildlib/configure.mak | 16 ++++++++--------
 buildlib/makefile.in   |  2 ++
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 55d7ade6c..b10011873 100644
--- a/Makefile
+++ b/Makefile
@@ -23,6 +23,6 @@ maintainer-clean dist-clean distclean pristine sanity: veryclean
 # The startup target builds the necessary configure scripts. It should
 # be used after a CVS checkout.
 CONVERTED=environment.mak include/config.h makefile
-$(BUILD)/include/config.h: buildlib/config.h.in
-$(BUILD)/environment.mak: buildlib/environment.mak.in
+$(BUILDDIR)/include/config.h: buildlib/config.h.in
+$(BUILDDIR)/environment.mak: buildlib/environment.mak.in
 include buildlib/configure.mak
diff --git a/buildlib/configure.mak b/buildlib/configure.mak
index fd4010f83..2338717b2 100644
--- a/buildlib/configure.mak
+++ b/buildlib/configure.mak
@@ -6,21 +6,21 @@
 # and has rules to run config.status should one of the .in files change.
 
 # Input
-#  BUILD - The build director
+#  BUILDDIR - The build directory
 #  CONVERTED - List of files output by configure $(BUILD) is prepended
 #              The caller must provide depends for these files
 # It would be a fairly good idea to run this after a cvs checkout.
-BUILD=build
+BUILDDIR=build
 
 .PHONY: startup
-startup: configure $(addprefix $(BUILD)/,$(CONVERTED))
+startup: configure $(addprefix $(BUILDDIR)/,$(CONVERTED))
 
 configure: aclocal.m4 configure.in
 	autoconf	
 aclocal.m4:
 	aclocal -I buildlib
-$(BUILD)/config.status: configure
-	test -e $(BUILD) || mkdir $(BUILD)	
-	(HERE=`pwd`; cd $(BUILD) && $$HERE/configure)
-$(addprefix $(BUILD)/,$(CONVERTED)): $(BUILD)/config.status
-	(cd $(BUILD) && ./config.status)
+$(BUILDDIR)/config.status: configure
+	test -e $(BUILDDIR) || mkdir $(BUILDDIR)	
+	(HERE=`pwd`; cd $(BUILDDIR) && $$HERE/configure)
+$(addprefix $(BUILDDIR)/,$(CONVERTED)): $(BUILDDIR)/config.status
+	(cd $(BUILDDIR) && ./config.status)
diff --git a/buildlib/makefile.in b/buildlib/makefile.in
index 4a12e7d9b..cf808643b 100644
--- a/buildlib/makefile.in
+++ b/buildlib/makefile.in
@@ -2,7 +2,9 @@
 
 # This is the build directory make file, it sets the build directory
 # and runs the src makefile.
+ifndef NOISY
 .SILENT:
+endif
 
 SRCDIR=@top_srcdir@
 SUBDIRS:=./docs ./bin ./bin/methods ./obj ./include/apt-pkg ./include/deity
-- 
cgit v1.2.3