From 4abd93b1a8a19afa6b8e9b6321cc6247901d41c5 Mon Sep 17 00:00:00 2001 From: "Janet B. Anderson" Date: Tue, 12 Oct 1999 14:27:55 +0000 Subject: [PATCH] Config Makefile now installs config files. --- config/Makefile | 31 +++++++++++++++++++++++++++++-- config/Makefile.Host | 34 ---------------------------------- 2 files changed, 29 insertions(+), 36 deletions(-) delete mode 100644 config/Makefile.Host diff --git a/config/Makefile b/config/Makefile index 821179ae5..65e5a9cf1 100644 --- a/config/Makefile +++ b/config/Makefile @@ -4,7 +4,34 @@ TOP=.. -include $(TOP)/config/CONFIG_BASE +include $(TOP)/configure/CONFIG -include $(TOP)/config/RULES_ARCHS +INSTALL_CONFIG = $(INSTALL_LOCATION)/config + +CONFIGS += CONFIG +CONFIGS += CONFIG_BASE +CONFIGS += CONFIG_BASE_VERSION +CONFIGS += CONFIG_COMMON +CONFIGS += CONFIG_ENV + +CONFIGS += CONFIG.Host.$(HOST_ARCH) +CONFIGS += CONFIG_HOST_ARCH.$(HOST_ARCH) +CONFIGS += CONFIG.Host.UnixCommon +CONFIGS += CONFIG_HOST_ARCH.UnixCommon + +CONFIGS += CONFIG.Vx +CONFIGS += $(CROSS_COMPILER_TARGET_ARCHS:%=CONFIG.Vx.%) + +CONFIGS += CONFIG_SITE +CONFIGS += CONFIG_SITE_ENV +CONFIGS += $(subst ../,,$(wildcard ../CONFIG_SITE*)) + +CONFIGS += RULES.Host +CONFIGS += RULES.Unix +CONFIGS += RULES.Vx +CONFIGS += RULES_ARCHS +CONFIGS += RULES_DIRS +CONFIGS += RULES_TOP + +include $(TOP)/configure/RULES_BUILD diff --git a/config/Makefile.Host b/config/Makefile.Host deleted file mode 100644 index bd74bb0b1..000000000 --- a/config/Makefile.Host +++ /dev/null @@ -1,34 +0,0 @@ -# -# $Id$ -# - -TOP = ../.. -include $(TOP)/config/CONFIG_BASE - -CONFIGS += CONFIG -CONFIGS += CONFIG_BASE -CONFIGS += CONFIG_BASE_VERSION -CONFIGS += CONFIG_COMMON -CONFIGS += CONFIG_ENV - -CONFIGS += CONFIG.Host.$(HOST_ARCH) -CONFIGS += CONFIG_HOST_ARCH.$(HOST_ARCH) -CONFIGS += CONFIG.Host.UnixCommon -CONFIGS += CONFIG_HOST_ARCH.UnixCommon - -CONFIGS += CONFIG.Vx -CONFIGS += $(CROSS_COMPILER_TARGET_ARCHS:%=CONFIG.Vx.%) - -CONFIGS += CONFIG_SITE -CONFIGS += CONFIG_SITE_ENV -CONFIGS += $(subst ../,,$(wildcard ../CONFIG_SITE*)) - -CONFIGS += RULES.Host -CONFIGS += RULES.Unix -CONFIGS += RULES.Vx -CONFIGS += RULES_ARCHS -CONFIGS += RULES_DIRS -CONFIGS += RULES_TOP - -include $(TOP)/config/RULES.Host -