epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Moved definitions INSTALL_LOCATION and CONFIG.

Browse Source
This commit is contained in:
Janet B. Anderson
2006-03-28 21:31:58 +00:00
parent e7f78a7d69
commit d43342f06f
5 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure/CONFIG
+7 -1
View File
@@ -17,7 +17,13 @@
# Common build definitions
#
CONFIG ?= $(TOP)/configure
ifndef EPICS_BASE
EPICS_BASE = $(INSTALL_LOCATION)
CONFIG = $(TOP)/configure
BASE_TOP=YES
else
CONFIG = $(EPICS_BASE)/configure
endif
-include $(CONFIG)/os/CONFIG_COMPAT
configure/CONFIG_BASE
+2 -6
View File
@@ -8,10 +8,6 @@
# in file LICENSE that is included with this distribution.
#*************************************************************************
ifndef EPICS_BASE
EPICS_BASE = $(INSTALL_LOCATION)
endif
#---------------------------------------------------------------
# Epics base directories
@@ -38,10 +34,10 @@ EPICS_BASE_HOST_LIBS += ca Com
#---------------------------------------------------------------
# Version number for base shared libraries (and win32 products)
ifeq ($(EPICS_BASE),$(TOP))
ifdef BASE_TOP
SHRLIB_VERSION = $(EPICS_VERSION).$(EPICS_REVISION)
PROD_VERSION = $(EPICS_VERSION).$(EPICS_REVISION)
endif # EPICS_BASE
endif # BASE_TOP
#---------------------------------------------------------------
# Base c preprocessor flags
configure/CONFIG_COMMON
+5 -1
View File
@@ -37,6 +37,10 @@ BUILD_ARCHS = $(EPICS_HOST_ARCH) $(CROSS1) $(CROSS2)
# otherwise override this in os/CONFIG_SITE.<host_arch>.Common
PERL=perl
#-------------------------------------------------------
# dbst based database optimization default
DB_OPT = NO
#-------------------------------------------------------
# Check configure/RELEASE file for consistency
CHECK_RELEASE_YES = checkRelease
@@ -45,7 +49,7 @@ CHECK_RELEASE_NO =
#-------------------------------------------------------
# Directories
INSTALL_LOCATION ?= $(TOP)
INSTALL_LOCATION = $(TOP)
TOOLS = $(CONFIG)/tools
INSTALL_LOCATION_LIB = $(INSTALL_LOCATION)/lib
configure/CONFIG_SITE
+5 -2
View File
@@ -158,7 +158,7 @@ CROSS_WARN=YES
# NOTE: Set to YES only if you have existing R3.13 extensions to be
# built with this base
#
COMPAT_TOOLS_313=NO
#COMPAT_TOOLS_313=YES
# Create and/or install files for R3.13 ioc application and extension builds?
# must be either YES or NO
@@ -169,7 +169,10 @@ COMPAT_TOOLS_313=NO
COMPAT_313=NO
# Installation directory
#Note: INSTALL_LOCATION definition moved to configure/RELEASE file
# If you don't want to install into $(TOP) dir then
# define INSTALL_LOCATION here
#INSTALL_LOCATION=<fullpathname>
INSTALL_LOCATION=/home/phoebus/JBA/install/base
# Use POSIX thread priority scheduling (YES or NO)
USE_POSIX_THREAD_PRIORITY_SCHEDULING = NO
configure/RELEASE
+2 -5
View File
@@ -9,6 +9,8 @@
#*************************************************************************
# RELEASE: Define location of external EPICS products
# Define INSTALL_LOCATION in CONFIG_SITE
# VX_DIR definition now in os/CONFIG_SITE.Common.vxWorksCommon
# RTEMS_BASE (and RTEMS_VERSION) now in os/CONFIG_SITE.Common.RTEMS
@@ -18,8 +20,3 @@
# RELEASE.Common.$(T_A)
# RELEASE.$(EPICS_HOST_ARCH).$(T_A)
# If you don't want to install into $(TOP) dir then
# define INSTALL_LOCATION here
#INSTALL_LOCATION=<fullpathname>
#INSTALL_LOCATION=/home/phoebus/JBA/install