summaryrefslogtreecommitdiff
path: root/buildlib
diff options
context:
space:
mode:
authorArch Librarian <arch@canonical.com>2004-09-20 16:57:05 +0000
committerArch Librarian <arch@canonical.com>2004-09-20 16:57:05 +0000
commitb0c76450cc4a6737a17c740870e219f48d706323 (patch)
tree048db36fee6f5d413405004fbf413cb7f6a3e23c /buildlib
parent4ae405e914578127efbe0eedcfec6d81780bee98 (diff)
Undid config breakage
Author: jgg Date: 2001-03-05 21:11:52 GMT Undid config breakage
Diffstat (limited to 'buildlib')
-rw-r--r--buildlib/defaults.mak2
-rw-r--r--buildlib/makefile.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak
index 37ee9f830..35a3e71de 100644
--- a/buildlib/defaults.mak
+++ b/buildlib/defaults.mak
@@ -82,7 +82,7 @@ YODL_MANPAGE_H = $(BASE)/buildlib/yodl_manpage.mak
SGML_MANPAGE_H = $(BASE)/buildlib/sgml_manpage.mak
FAIL_H = $(BASE)/buildlib/fail.mak
-include $(wildcard $(BUILD)/environment.*mak)
+include $(BUILD)/environment.mak
ifdef STATICLIBS
LIBRARY_H += $(BASE)/buildlib/staticlibrary.mak
diff --git a/buildlib/makefile.in b/buildlib/makefile.in
index ec7cdd63a..756565f40 100644
--- a/buildlib/makefile.in
+++ b/buildlib/makefile.in
@@ -21,7 +21,7 @@ all headers library clean veryclean binary program doc:
.PHONY: maintainer-clean dist-clean pristine sanity distclean
maintainer-clean dist-clean pristine sanity distclean:
-rm -rf $(DIRS)
- -rm -f config.cache config.log config.status environment.*mak makefile
+ -rm -f config.cache config.log config.status environment.mak makefile
# Create the required directories and build the shims
# The configure script fills in below, and then we do the right things..