Merged changes from 3.14 branch

Up to revno 12420 inclusive.
This commit is contained in:
Andrew Johnson
2013-06-07 18:08:38 -05:00
27 changed files with 246 additions and 153 deletions

View File

@ -75,9 +75,12 @@ INSTALL_DBD = $(INSTALL_LOCATION)/dbd
INSTALL_DB = $(INSTALL_LOCATION)/db
INSTALL_CONFIG = $(INSTALL_LOCATION)/configure
#Directory for OS independant build created files
# Directory for OS independant build created files
COMMON_DIR = ../O.Common
# The IOC's path to $(TOP), may be overridden inside the application
IOCS_APPL_TOP = $(INSTALL_LOCATION)
#-------------------------------------------------------
# Make echo output - suppress echoing if make's '-s' flag is set
NOP = :