From 2ced0242bd87687aa4b45eb910d3a8062b77ff50 Mon Sep 17 00:00:00 2001 From: "Janet B. Anderson" Date: Thu, 23 Jan 1997 17:28:45 +0000 Subject: [PATCH] Added install include dir to UNIX_INCLUDES. --- config/CONFIG.Linux | 3 ++- config/CONFIG.Vx.68k | 2 +- config/CONFIG.Vx.pc486 | 3 ++- config/CONFIG.WIN32 | 2 +- config/CONFIG.alpha | 3 ++- config/CONFIG.hp700 | 3 ++- config/CONFIG.sgi | 3 ++- config/CONFIG.solaris | 5 ++--- config/CONFIG.sun4 | 3 ++- 9 files changed, 16 insertions(+), 11 deletions(-) diff --git a/config/CONFIG.Linux b/config/CONFIG.Linux index d2cffaa7a..7340eebc9 100644 --- a/config/CONFIG.Linux +++ b/config/CONFIG.Linux @@ -26,6 +26,7 @@ CCC = CC MV = mv RMDIR = rm -rf MKDIR = mkdir +CHMOD = "/bin/chmod" ACC_ANSI_INVOKE_W_NO = $(ACC) -Xa -w ACC_ANSI_INVOKE_W_YES = $(ACC) -Xa @@ -84,7 +85,7 @@ OPTIM_NO = UNIX_OPT_FLAGS = $(OPTIM_$(UNIX_OPT)) # Include files -UNIX_INCLUDES = -I. -I.. $(USR_INCLUDES) -I$(EPICS_BASE_INCLUDE) \ +UNIX_INCLUDES = -I. -I.. $(USR_INCLUDES) -I$(INSTALL_INCLUDE) -I$(EPICS_BASE_INCLUDE) \ -I$(EPICS_BASE_INCLUDE)/os/$(T_A) # Operating system flags diff --git a/config/CONFIG.Vx.68k b/config/CONFIG.Vx.68k index 6d84c6063..6ece9ff43 100644 --- a/config/CONFIG.Vx.68k +++ b/config/CONFIG.Vx.68k @@ -29,7 +29,7 @@ VX_OPT_NO = VX_OPT_FLAGS = $(VX_OPT_$(VX_OPT)) # Include files -VX_INCLUDES = -I. -I.. $(USR_INCLUDES) -I$(EPICS_BASE_INCLUDE) \ +VX_INCLUDES = -I. -I.. $(USR_INCLUDES) -I$(INSTALL_INCLUDE) -I$(EPICS_BASE_INCLUDE) \ -I$(EPICS_BASE_INCLUDE)/os/vxWorks -I$(VX_INCLUDE) # Warnings diff --git a/config/CONFIG.Vx.pc486 b/config/CONFIG.Vx.pc486 index e406d7353..41f027bf5 100644 --- a/config/CONFIG.Vx.pc486 +++ b/config/CONFIG.Vx.pc486 @@ -11,6 +11,7 @@ RM=rm -f CP=cp RMDIR=rm -rf MKDIR=mkdir +CHMOD = "/bin/chmod" # overrides defines in CONFIG_SITE that don't fit Tornado # @@ -55,7 +56,7 @@ VX_OPT_NO = -O0 VX_OPT_FLAGS = $(VX_OPT_$(VX_OPT)) # Include files -VX_INCLUDES = -I. -I.. $(USR_INCLUDES) -I$(EPICS_BASE_INCLUDE) \ +VX_INCLUDES = -I. -I.. $(USR_INCLUDES) -I$(INSTALL_INCLUDE) -I$(EPICS_BASE_INCLUDE) \ -I$(EPICS_BASE_INCLUDE)/os/vxWorks -I$(VX_INCLUDE) # Warnings diff --git a/config/CONFIG.WIN32 b/config/CONFIG.WIN32 index 88fd47c6e..ca5d43a7f 100644 --- a/config/CONFIG.WIN32 +++ b/config/CONFIG.WIN32 @@ -48,7 +48,7 @@ MKDIR=mkdir RMDIR=rm -rf # Include files -HOST_INCLUDES = -I. -I.. $(USR_INCLUDES) -I$(EPICS_BASE_INCLUDE) \ +HOST_INCLUDES = -I. -I.. $(USR_INCLUDES) -I$(INSTALL_INCLUDE) -I$(EPICS_BASE_INCLUDE) \ -I$(EPICS_BASE_INCLUDE)/os/$(ARCH_CLASS) # Operating system flags (from win32.mak) diff --git a/config/CONFIG.alpha b/config/CONFIG.alpha index 7cb9d90d7..614b4216c 100644 --- a/config/CONFIG.alpha +++ b/config/CONFIG.alpha @@ -22,6 +22,7 @@ CCC = CC MV = mv RMDIR = rm -rf MKDIR = mkdir +CHMOD = "/bin/chmod" ACC_ANSI_INVOKE_W_NO = $(ACC) -w ACC_ANSI_INVOKE_W_YES = $(ACC) @@ -78,7 +79,7 @@ OPTIM_NO = UNIX_OPT_FLAGS = $(OPTIM_$(UNIX_OPT)) # Include files -UNIX_INCLUDES = -I. -I.. $(USR_INCLUDES) -I$(EPICS_BASE_INCLUDE) \ +UNIX_INCLUDES = -I. -I.. $(USR_INCLUDES) -I$(INSTALL_INCLUDE) -I$(EPICS_BASE_INCLUDE) \ -I$(EPICS_BASE_INCLUDE)/os/$(T_A) # Operating system flags diff --git a/config/CONFIG.hp700 b/config/CONFIG.hp700 index e4946a401..0df30d2fc 100644 --- a/config/CONFIG.hp700 +++ b/config/CONFIG.hp700 @@ -24,6 +24,7 @@ CCC = CC MV = mv RMDIR = rm -rf MKDIR = mkdir +CHMOD = "/bin/chmod" ACC_ANSI_INVOKE_W_NO = $(ACC) -w ACC_ANSI_INVOKE_W_YES = $(ACC) @@ -86,7 +87,7 @@ OPTIM_NO = UNIX_OPT_FLAGS = $(OPTIM_$(UNIX_OPT)) # Include files -UNIX_INCLUDES = -I. -I.. $(USR_INCLUDES) -I$(EPICS_BASE_INCLUDE) \ +UNIX_INCLUDES = -I. -I.. $(USR_INCLUDES) -I$(INSTALL_INCLUDE) -I$(EPICS_BASE_INCLUDE) \ -I$(EPICS_BASE_INCLUDE)/os/$(T_A) # Operating system flags diff --git a/config/CONFIG.sgi b/config/CONFIG.sgi index 549add5b6..17c701cd0 100644 --- a/config/CONFIG.sgi +++ b/config/CONFIG.sgi @@ -25,6 +25,7 @@ CCC = CC MV = mv RMDIR = rm -rf MKDIR = mkdir +CHMOD = "/bin/chmod" ACC_ANSI_INVOKE_W_NO = $(ACC) -xansi -w ACC_ANSI_INVOKE_W_YES = $(ACC) -xansi @@ -84,7 +85,7 @@ OPTIM_NO = UNIX_OPT_FLAGS = $(OPTIM_$(UNIX_OPT)) # Include files -UNIX_INCLUDES = -I. -I.. $(USR_INCLUDES) -I$(EPICS_BASE_INCLUDE) \ +UNIX_INCLUDES = -I. -I.. $(USR_INCLUDES) -I$(INSTALL_INCLUDE) -I$(EPICS_BASE_INCLUDE) \ -I$(EPICS_BASE_INCLUDE)/os/$(T_A) # Operating system flags diff --git a/config/CONFIG.solaris b/config/CONFIG.solaris index e89241686..b9b7e230c 100644 --- a/config/CONFIG.solaris +++ b/config/CONFIG.solaris @@ -31,13 +31,12 @@ LEX = $(ELEX) G++ = /opt/gnu/bin/g++ CCC = /opt/SUNWspro/bin/CC -RMDIR = rm -rf -MKDIR = mkdir CP=cp MV=mv RM=rm -f MKDIR=mkdir RMDIR=rm -rf +CHMOD = "/bin/chmod" EXE= OBJ=.o @@ -118,7 +117,7 @@ OPTIM_NO = UNIX_OPT_FLAGS = $(OPTIM_$(UNIX_OPT)) # Include files -UNIX_INCLUDES = -I. -I.. $(USR_INCLUDES) -I$(EPICS_BASE_INCLUDE) \ +UNIX_INCLUDES = -I. -I.. $(USR_INCLUDES) -I$(INSTALL_INCLUDE) -I$(EPICS_BASE_INCLUDE) \ -I$(EPICS_BASE_INCLUDE)/os/$(T_A) # Operating system flags diff --git a/config/CONFIG.sun4 b/config/CONFIG.sun4 index 825c1a8f0..2adbb8da0 100644 --- a/config/CONFIG.sun4 +++ b/config/CONFIG.sun4 @@ -25,6 +25,7 @@ CCC = /usr/lang/CC RMDIR = rm -rf MKDIR = mkdir +CHMOD = "/bin/chmod" CP=cp MV=mv RM=rm -f @@ -116,7 +117,7 @@ OPTIM_NO = UNIX_OPT_FLAGS = $(OPTIM_$(UNIX_OPT)) # Include files -UNIX_INCLUDES = -I. -I.. $(USR_INCLUDES) -I$(EPICS_BASE_INCLUDE) \ +UNIX_INCLUDES = -I. -I.. $(USR_INCLUDES) -I$(INSTALL_INCLUDE) -I$(EPICS_BASE_INCLUDE) \ -I$(EPICS_BASE_INCLUDE)/os/$(T_A) # Operating system flags