diff options
| author | Arch Librarian <arch@canonical.com> | 2004-09-20 16:57:05 +0000 |
|---|---|---|
| committer | Arch Librarian <arch@canonical.com> | 2004-09-20 16:57:05 +0000 |
| commit | b0c76450cc4a6737a17c740870e219f48d706323 (patch) | |
| tree | 048db36fee6f5d413405004fbf413cb7f6a3e23c | |
| parent | 4ae405e914578127efbe0eedcfec6d81780bee98 (diff) | |
Undid config breakage
Author: jgg
Date: 2001-03-05 21:11:52 GMT
Undid config breakage
| -rw-r--r-- | buildlib/defaults.mak | 2 | ||||
| -rw-r--r-- | buildlib/makefile.in | 2 | ||||
| -rw-r--r-- | configure.in | 6 |
3 files changed, 4 insertions, 6 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.. diff --git a/configure.in b/configure.in index 1c4857191..95ff0176e 100644 --- a/configure.in +++ b/configure.in @@ -14,8 +14,7 @@ dnl configure.in correctly and can be run at any time AC_INIT(configure.in) AC_CONFIG_AUX_DIR(buildlib) -AC_CONFIG_HEADER(include/config.h:buildlib/core/config.h.in include/apti18n.h:buildlib/core/apti18n.h.in) -CONFIG_STATUS=config.status.apt +AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- AC_DEFINE_UNQUOTED(VERSION,"0.5.1") @@ -129,7 +128,6 @@ if test x"$c9x_ints" = x"no"; then HAVE_C9X= AC_SUBST(HAVE_C9X) - AC_OUTPUT_COMMANDS([echo Have c9x $HAVE_C9X],[HAVE_C9X=$HAVE_C9X]) fi dnl HP-UX sux.. @@ -164,4 +162,4 @@ ah_NUM_PROCS ah_GLIBC_VER ah_LIBSTDCPP_VER -AC_OUTPUT(environment.mak:buildlib/core/environment.mak.in makefile:buildlib/makefile.in,make -s dirs) +AC_OUTPUT(environment.mak:buildlib/environment.mak.in makefile:buildlib/makefile.in,make -s dirs) |