From 93bf083d699c60f1ac40297bfa6783fb0cb800d8 Mon Sep 17 00:00:00 2001
From: Arch Librarian <arch@canonical.com>
Date: Mon, 20 Sep 2004 16:51:15 +0000
Subject: Sync Author: jgg Date: 1998-10-30 07:53:30 GMT Sync

---
 buildlib/defaults.mak | 4 +++-
 buildlib/makefile.in  | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'buildlib')

diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak
index c6a2c15d7..9b011301e 100644
--- a/buildlib/defaults.mak
+++ b/buildlib/defaults.mak
@@ -26,7 +26,9 @@
 # but by explicly setting the BUILD variable. Make is invoked from
 # within the source itself which is much more compatible with compilation
 # environments.
+ifndef NOISY
 .SILENT:
+endif
 
 # Search for the build directory
 ifdef BUILD
@@ -51,7 +53,7 @@ BIN := $(BUILD)/bin
 LIB := $(BIN)
 OBJ := $(BUILD)/obj/$(SUBDIR)
 DEP := $(OBJ)
-DOC := $(BUILD)/doc
+DOC := $(BUILD)/docs
 
 # Module types
 LIBRARY_H = $(BASE)/buildlib/library.mak
diff --git a/buildlib/makefile.in b/buildlib/makefile.in
index 424ed1e46..de44f47b6 100644
--- a/buildlib/makefile.in
+++ b/buildlib/makefile.in
@@ -6,7 +6,7 @@
 
 SRCDIR=@top_srcdir@
 SUBDIRS:=./doc ./bin ./bin/methods ./obj ./include/apt-pkg ./include/deity
-SUBDIRS+=./obj/doc ./obj/apt-pkg ./obj/deity ./obj/gui ./obj/cmdline \
+SUBDIRS+=./obj/docs ./obj/apt-pkg ./obj/deity ./obj/gui ./obj/cmdline \
          ./obj/test ./obj/methods
 BUILD:=$(shell pwd)
 export BUILD
-- 
cgit v1.2.3