From 233d65ea0de545ea5ec11ce2e5eccf9590c4abfa Mon Sep 17 00:00:00 2001 From: "Janet B. Anderson" Date: Mon, 20 Mar 2006 19:18:35 +0000 Subject: [PATCH] Install config/tools/* into INSTALL_LOCATION/config/tools not bin/(arch>. --- Makefile | 2 +- config/Makefile | 3 +++ config/tools/Makefile | 24 ------------------------ 3 files changed, 4 insertions(+), 25 deletions(-) delete mode 100644 config/tools/Makefile diff --git a/Makefile b/Makefile index 83e5b15d4..711bf6824 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ TOP = . include $(TOP)/configure/CONFIG ifeq ($(findstring YES,$(COMPAT_313) $(COMPAT_TOOLS_313)),YES) -DIRS += config config/tools +DIRS += config endif DIRS += configure src diff --git a/config/Makefile b/config/Makefile index 55103d3cd..d4ba166ad 100644 --- a/config/Makefile +++ b/config/Makefile @@ -20,6 +20,9 @@ INSTALL_CONFIG = $(INSTALL_LOCATION)/config CONFIGS += $(subst ../,,$(wildcard ../CONFIG*)) CONFIGS += $(subst ../,,$(wildcard ../RULES*)) + +CONFIGS += $(subst ../,,$(wildcard ../tools/*.pl)) + endif include $(TOP)/configure/RULES diff --git a/config/tools/Makefile b/config/tools/Makefile deleted file mode 100644 index b62b39e07..000000000 --- a/config/tools/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -#************************************************************************* -# Copyright (c) 2002 The University of Chicago, as Operator of Argonne -# National Laboratory. -# Copyright (c) 2002 The Regents of the University of California, as -# Operator of Los Alamos National Laboratory. -# EPICS BASE Versions 3.13.7 -# and higher are distributed subject to a Software License Agreement found -# in file LICENSE that is included with this distribution. -#************************************************************************* -# -# $Id$ -# - -TOP=../.. - -include $(TOP)/configure/CONFIG - -ifeq ($(findstring YES,$(COMPAT_313) $(COMPAT_TOOLS_313)),YES) -SCRIPTS_HOST += $(subst ../,,$(wildcard ../*.pl)) -SCRIPTS_HOST += installEpics -endif - -include $(TOP)/configure/RULES -