summaryrefslogtreecommitdiff
path: root/buildlib
diff options
context:
space:
mode:
authorArch Librarian <arch@canonical.com>2004-09-20 16:57:04 +0000
committerArch Librarian <arch@canonical.com>2004-09-20 16:57:04 +0000
commit4ae405e914578127efbe0eedcfec6d81780bee98 (patch)
tree5e6e1b6c67fcae7c5e458b65c26f8ed9de5b9cdc /buildlib
parent10639577016904cccab77c311e7c0b4363997504 (diff)
JoeyH's dpkg::preconfig not working.
Author: jgg Date: 2001-03-05 21:09:12 GMT JoeyH's dpkg::preconfig not working.
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 35a3e71de..37ee9f830 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 $(BUILD)/environment.mak
+include $(wildcard $(BUILD)/environment.*mak)
ifdef STATICLIBS
LIBRARY_H += $(BASE)/buildlib/staticlibrary.mak
diff --git a/buildlib/makefile.in b/buildlib/makefile.in
index 756565f40..ec7cdd63a 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..