mirror of
https://github.com/nasa/trick.git
synced 2025-06-18 15:18:18 +00:00
Changed 'git' to 'trick-gte'. Ref #475
This commit is contained in:
@ -129,9 +129,9 @@ int Trick::SlaveInfo::start() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (strstr(passp->pw_shell, "csh")) {
|
if (strstr(passp->pw_shell, "csh")) {
|
||||||
startup_command << " setenv TRICK_HOST_CPU `gte TRICK_HOST_CPU` ; " ;
|
startup_command << " setenv TRICK_HOST_CPU `trick-gte TRICK_HOST_CPU` ; " ;
|
||||||
} else {
|
} else {
|
||||||
startup_command << " export TRICK_HOST_CPU=`gte TRICK_HOST_CPU` ; " ;
|
startup_command << " export TRICK_HOST_CPU=`trick-gte TRICK_HOST_CPU` ; " ;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -12,11 +12,11 @@
|
|||||||
-include ${TRICK_HOME}/makefiles/Makefile.common
|
-include ${TRICK_HOME}/makefiles/Makefile.common
|
||||||
|
|
||||||
ifndef TRICK_HOST_CPU
|
ifndef TRICK_HOST_CPU
|
||||||
TRICK_HOST_CPU := $(shell gte TRICK_HOST_CPU)
|
TRICK_HOST_CPU := $(shell trick-gte TRICK_HOST_CPU)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifndef TRICK_HOST_TYPE
|
ifndef TRICK_HOST_TYPE
|
||||||
TRICK_HOST_TYPE := $(shell gte TRICK_HOST_TYPE)
|
TRICK_HOST_TYPE := $(shell trick-gte TRICK_HOST_TYPE)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
||||||
|
@ -22,11 +22,11 @@
|
|||||||
## DIRECTORY DEFINITIONS ##
|
## DIRECTORY DEFINITIONS ##
|
||||||
#############################################################################
|
#############################################################################
|
||||||
ifndef TRICK_HOST_CPU
|
ifndef TRICK_HOST_CPU
|
||||||
TRICK_HOST_CPU := $(shell gte TRICK_HOST_CPU)
|
TRICK_HOST_CPU := $(shell trick-gte TRICK_HOST_CPU)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifndef TRICK_HOST_TYPE
|
ifndef TRICK_HOST_TYPE
|
||||||
TRICK_HOST_TYPE := $(shell gte TRICK_HOST_TYPE)
|
TRICK_HOST_TYPE := $(shell trick-gte TRICK_HOST_TYPE)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
SHELL = /bin/sh
|
SHELL = /bin/sh
|
||||||
|
|
||||||
ifndef TRICK_HOST_CPU
|
ifndef TRICK_HOST_CPU
|
||||||
TRICK_HOST_CPU := $(shell gte TRICK_HOST_CPU)
|
TRICK_HOST_CPU := $(shell trick-gte TRICK_HOST_CPU)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifndef TRICK_HOST_TYPE
|
ifndef TRICK_HOST_TYPE
|
||||||
TRICK_HOST_TYPE := $(shell gte TRICK_HOST_TYPE)
|
TRICK_HOST_TYPE := $(shell trick-gte TRICK_HOST_TYPE)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
||||||
@ -30,8 +30,8 @@ INCLUDES = -I..
|
|||||||
top:
|
top:
|
||||||
@ if [ "${TRICK_HOME}" != "" ] ; then \
|
@ if [ "${TRICK_HOME}" != "" ] ; then \
|
||||||
$(MAKE) -e all \
|
$(MAKE) -e all \
|
||||||
"CC = `gte TRICK_CC` " \
|
"CC = `trick-gte TRICK_CC` " \
|
||||||
"CPP = `gte TRICK_CPPC` "; \
|
"CPP = `trick-gte TRICK_CPPC` "; \
|
||||||
else \
|
else \
|
||||||
$(MAKE) all \
|
$(MAKE) all \
|
||||||
"TRICK_HOST_TYPE = `uname -s` " \
|
"TRICK_HOST_TYPE = `uname -s` " \
|
||||||
|
Reference in New Issue
Block a user