From db2f00cc4ee9dbb43c4a0d017ce4adb5710c2097 Mon Sep 17 00:00:00 2001 From: "John M. Penn" Date: Wed, 13 Sep 2017 14:46:28 -0500 Subject: [PATCH] Changed 'git' to 'trick-gte'. Ref #475 --- trick_source/sim_services/MasterSlave/Master.cpp | 4 ++-- trick_source/trick_utils/comm/test_programs/makefile | 4 ++-- trick_source/trick_utils/trick_adt/test_program/makefile | 4 ++-- trick_source/trick_utils/units/Unittest/makefile | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/trick_source/sim_services/MasterSlave/Master.cpp b/trick_source/sim_services/MasterSlave/Master.cpp index 26fe6ae6..53e53895 100644 --- a/trick_source/sim_services/MasterSlave/Master.cpp +++ b/trick_source/sim_services/MasterSlave/Master.cpp @@ -129,9 +129,9 @@ int Trick::SlaveInfo::start() { } 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 { - startup_command << " export TRICK_HOST_CPU=`gte TRICK_HOST_CPU` ; " ; + startup_command << " export TRICK_HOST_CPU=`trick-gte TRICK_HOST_CPU` ; " ; } diff --git a/trick_source/trick_utils/comm/test_programs/makefile b/trick_source/trick_utils/comm/test_programs/makefile index 524f918f..f1739a41 100644 --- a/trick_source/trick_utils/comm/test_programs/makefile +++ b/trick_source/trick_utils/comm/test_programs/makefile @@ -12,11 +12,11 @@ -include ${TRICK_HOME}/makefiles/Makefile.common ifndef TRICK_HOST_CPU -TRICK_HOST_CPU := $(shell gte TRICK_HOST_CPU) +TRICK_HOST_CPU := $(shell trick-gte TRICK_HOST_CPU) endif ifndef TRICK_HOST_TYPE -TRICK_HOST_TYPE := $(shell gte TRICK_HOST_TYPE) +TRICK_HOST_TYPE := $(shell trick-gte TRICK_HOST_TYPE) endif diff --git a/trick_source/trick_utils/trick_adt/test_program/makefile b/trick_source/trick_utils/trick_adt/test_program/makefile index e389cf08..b2f875dd 100644 --- a/trick_source/trick_utils/trick_adt/test_program/makefile +++ b/trick_source/trick_utils/trick_adt/test_program/makefile @@ -22,11 +22,11 @@ ## DIRECTORY DEFINITIONS ## ############################################################################# ifndef TRICK_HOST_CPU -TRICK_HOST_CPU := $(shell gte TRICK_HOST_CPU) +TRICK_HOST_CPU := $(shell trick-gte TRICK_HOST_CPU) endif ifndef TRICK_HOST_TYPE -TRICK_HOST_TYPE := $(shell gte TRICK_HOST_TYPE) +TRICK_HOST_TYPE := $(shell trick-gte TRICK_HOST_TYPE) endif diff --git a/trick_source/trick_utils/units/Unittest/makefile b/trick_source/trick_utils/units/Unittest/makefile index b06b2c0f..4710cd08 100644 --- a/trick_source/trick_utils/units/Unittest/makefile +++ b/trick_source/trick_utils/units/Unittest/makefile @@ -1,11 +1,11 @@ SHELL = /bin/sh ifndef TRICK_HOST_CPU -TRICK_HOST_CPU := $(shell gte TRICK_HOST_CPU) +TRICK_HOST_CPU := $(shell trick-gte TRICK_HOST_CPU) endif ifndef TRICK_HOST_TYPE -TRICK_HOST_TYPE := $(shell gte TRICK_HOST_TYPE) +TRICK_HOST_TYPE := $(shell trick-gte TRICK_HOST_TYPE) endif @@ -30,8 +30,8 @@ INCLUDES = -I.. top: @ if [ "${TRICK_HOME}" != "" ] ; then \ $(MAKE) -e all \ - "CC = `gte TRICK_CC` " \ - "CPP = `gte TRICK_CPPC` "; \ + "CC = `trick-gte TRICK_CC` " \ + "CPP = `trick-gte TRICK_CPPC` "; \ else \ $(MAKE) all \ "TRICK_HOST_TYPE = `uname -s` " \