summaryrefslogtreecommitdiff
path: root/buildlib
diff options
context:
space:
mode:
authorArch Librarian <arch@canonical.com>2004-09-20 16:51:21 +0000
committerArch Librarian <arch@canonical.com>2004-09-20 16:51:21 +0000
commit53da8d703e228f7107688aa38fe305a0ba8d91e4 (patch)
tree9709cca0fd63e5c6fc82fbfc0841a9bdc3216c26 /buildlib
parentc7c1b0f62edbefb01efce67f64bd44397be36946 (diff)
Fixed make woops
Author: jgg Date: 1998-11-06 03:10:24 GMT Fixed make woops
Diffstat (limited to 'buildlib')
-rw-r--r--buildlib/configure.mak16
-rw-r--r--buildlib/makefile.in2
2 files changed, 10 insertions, 8 deletions
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